zenithinstall - Merge branch 'milestone2' into zenith-install

docker_files updated to support assets in ~/Zenith/assets folder
		installer updated to support assets in ~/Zenith/assets folder

.gitignore

@@ -5,3 +5,6 @@ zenith.db
 zenith.log
 zenith.db-shm
 zenith.db-wal
+installer/*.tar.gz
+installer/*.tar.gz.prev
+docker_files/zenith-docker_*

CHANGELOG.md

@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Upgraded to GHC 9.6.5
+- Implemented config and data folder
 
 ### Fixed
 

app/Main.hs

@@ -202,7 +202,7 @@ processUri user pwd =
 
 main :: IO ()
 main = do
-  config <- load [ "$(HOME)/Zenith/zenith.cfg" ]
+  config <- load ["$(HOME)/Zenith/zenith.cfg"]
   args <- getArgs
   dbFileName <- require config "dbFileName"
   {-nodeUser <- require config "nodeUser"-}

docker_files/Dockerfile

@@ -28,9 +28,9 @@ RUN echo  "1234\n1234\n" | passwd zenusr
 
 RUN mkdir /home/zenusr/Zenith
 RUN chown zenusr:zenusr -R /home/zenusr/Zenith
-RUN mkdir /home/zenusr/assets
+#RUN mkdir /home/zenusr/Zenith/assets
-COPY assets/* /home/zenusr/assets/
+#COPY assets/* /home/zenusr/Zenith/assets/
-RUN chown zenusr:zenusr -R /home/zenusr/assets
+#RUN chown zenusr:zenusr -R /home/zenusr/Zenith/assets
 
 COPY scripts/bash_rc_adm /root/.bashrc
 COPY scripts/bash_rc_usr /home/zenusr/.bashrc

docker_files/setup_docker

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 ZVERSION="0.6.0.0"
 echo
 echo "Zenith Full Node Docker Image Setup"
@@ -27,8 +27,10 @@ if systemctl is-active --quiet docker; then
   docker load < zenith-docker_$ZVERSION.tar  
   echo "... docker image zenith-docker:"$ZVERSION" loaded."
   echo "... creating Zenith folder"
-  mkdir $HOME/Zenith
+  mkdir -p $HOME/Zenith/assets
+  echo "... creating default configuration"
   cp cfg/zenith.cfg $HOME/Zenith/
+  cp -r /assets/ $HOME/Zenith/assets
   if ! [ -d $HOME/.local/bin ]; then
     echo "... creating $HOME/.local/bin folder"
     mkdir -p $HOME/.local/bin
@@ -38,10 +40,10 @@ if systemctl is-active --quiet docker; then
   if [ -f $HOME/.local/bin/runzenith ]; then
     rm  $HOME/.local/bin/runzenith
   fi
-  echo "... copying runzenith to $HOME/.local/bin "  
+  echo "... copying runzenith to $HOME/.local/bin"  
   cp cfg/runzenith $HOME/.local/bin/
   if echo $PATH | grep -q $HOME/.local/bin ; then
-    echo PATH=$PATH:$HOME/.local/bin' | tee -a $HOME/.bashrc
+    echo PATH=$PATH:$HOME/.local/bin | tee -a $HOME/.bashrc
     echo "Reloading configuration ...."
     source $HOME/.bashrc
   fi

installer/zenith-0.6.0.0-amd64/zenconfig

@@ -15,12 +15,11 @@ else
   	mkdir -p $HOME/Zenith
   	echo "Copying default configuration ...."
   	cp ./cfg/zenith.cfg $HOME/Zenith/  
-    chown -R $USER $HOME/Zenith
     echo "Creating assets folder ...."
-    mkdir -p $HOME/assets
+    mkdir -p $HOME/Zenith/assets
     echo "Transfering assets to new folder ...."
-    cp ./assets/* $HOME/assets
+    cp ./assets/* $HOME/Zenith/assets
-    chown -R $USER $HOME/assets
+    chown -R $USER $HOME/Zenith
   	echo "Configuring library path ...."
     if [ ! grep -q "LD_LIBRARY_PATH" "$HOME/.bashrc" ]; then
     	echo 'export LD_LIBRARY_PATH=/usr/local/lib' | tee -a $HOME/.bashrc

src/Zenith/GUI.hs

@@ -25,6 +25,8 @@ import Lens.Micro ((&), (+~), (.~), (?~), (^.), set)
 import Lens.Micro.TH
 import Monomer
 import qualified Monomer.Lens as L
+import System.Directory (getHomeDirectory)
+import System.FilePath ((</>))
 import System.Hclip
 import Text.Printf
 import Text.Wrap (FillScope(..), FillStrategy(..), WrapSettings(..), wrapText)
@@ -141,6 +143,7 @@ data AppModel = AppModel
   , _recipientValid :: !Bool
   , _amountValid :: !Bool
   , _showId :: !(Maybe T.Text)
+  , _home :: !FilePath
   } deriving (Eq, Show)
 
 makeLenses ''AppModel
@@ -440,7 +443,11 @@ buildUI wenv model = widgetTree
                                  (fromIntegral $ qrCodeWidth qr))
                               [fitWidth]
                           Nothing ->
-                            image_ "./assets/1F928_color.png" [fitEither]) `styleBasic`
+                            image_
+                              (T.pack $
+                               (model ^. home) </>
+                               "Zenith/assets/1F928_color.png")
+                              [fitEither]) `styleBasic`
                      [bgColor white, height 100, width 100]
                    , filler
                    ] `styleBasic`
@@ -504,7 +511,9 @@ buildUI wenv model = widgetTree
         , spacer
         , label (showt $ model ^. timer) `styleBasic` [padding 3, textSize 8]
         , filler
-        , image_ "./assets/1F993.png" [fitHeight] `styleBasic`
+        , image_
+            (T.pack $ (model ^. home) </> "Zenith/assets/1F993.png")
+            [fitHeight] `styleBasic`
           [height 24, width 24] `nodeVisible`
           (model ^. zebraOn)
         , label
@@ -1242,6 +1251,10 @@ txtWrap = wrapText (WrapSettings False True NoFill FillAfterFirst) 32
 
 runZenithGUI :: Config -> IO ()
 runZenithGUI config = do
+  homeDir <- try getHomeDirectory :: IO (Either IOError FilePath)
+  case homeDir of
+    Left e -> print e
+    Right hD -> do
       let host = c_zebraHost config
       let port = c_zebraPort config
       let dbFilePath = c_dbPath config
@@ -1260,11 +1273,13 @@ runZenithGUI config = do
               walList <- getWallets pool $ zgb_net chainInfo
               accList <-
                 if not (null walList)
-              then runNoLoggingT $ getAccounts pool $ entityKey $ head walList
+                  then runNoLoggingT $
+                       getAccounts pool $ entityKey $ head walList
                   else return []
               addrList <-
                 if not (null accList)
-              then runNoLoggingT $ getAddresses pool $ entityKey $ head accList
+                  then runNoLoggingT $
+                       getAddresses pool $ entityKey $ head accList
                   else return []
               txList <-
                 if not (null addrList)
@@ -1327,7 +1342,8 @@ runZenithGUI config = do
                       False
                       False
                       Nothing
-          startApp model handleEvent buildUI params
+                      hD
+              startApp model handleEvent buildUI (params hD)
         Left e -> do
           initDb dbFilePath
           let model =
@@ -1372,16 +1388,26 @@ runZenithGUI config = do
                   False
                   False
                   Nothing
-      startApp model handleEvent buildUI params
+                  hD
+          startApp model handleEvent buildUI (params hD)
   where
-    params =
+    params hd =
       [ appWindowTitle "Zenith - Zcash Full Node Wallet"
       , appWindowState $ MainWindowNormal (1000, 700)
       , appTheme zenithTheme
-      , appFontDef "Regular" "./assets/Atkinson-Hyperlegible-Regular-102.ttf" --"./assets/DejaVuSansMono.ttf" 
+      , appFontDef
-      , appFontDef "Bold" "./assets/Atkinson-Hyperlegible-Bold-102.ttf"
+          "Regular"
-      , appFontDef "Italic" "./assets/Atkinson-Hyperlegible-Italic-102.ttf"
+          (T.pack $
-      , appFontDef "Remix" "./assets/remixicon.ttf"
+           hd </>
+           "Zenith/assets/Atkinson-Hyperlegible-Regular-102.ttf" --"./assets/DejaVuSansMono.ttf" 
+           )
+      , appFontDef
+          "Bold"
+          (T.pack $ hd </> "Zenith/assets/Atkinson-Hyperlegible-Bold-102.ttf")
+      , appFontDef
+          "Italic"
+          (T.pack $ hd </> "Zenith/assets/Atkinson-Hyperlegible-Italic-102.ttf")
+      , appFontDef "Remix" (T.pack $ hd </> "Zenith/assets/remixicon.ttf")
       , appDisableAutoScale True
       , appScaleFactor 2.0
       , appInitEvent AppInit

zenith.cabal

@@ -47,6 +47,8 @@ library
     , brick
     , bytestring
     , data-default
+    , directory
+    , filepath
     , esqueleto
     , resource-pool
     , binary