Merge pull request #10 from john-mutuma/continous_improvements

john-mutuma · web-flow · commit b90a2dd7283e · 2024-12-11T10:51:06.000+03:00
Continous improvements
diff --git a/README.md b/README.md
@@ -50,9 +50,9 @@ when opening a conflicted file within lazygit `:LazyGit` UI
 
 ## Useful keyboard mappings/shortcuts and useful commands to use the IDE like a pro
 
-### Normal mode
+The `<leader>` key is `,` by default
 
-The `<leader>` key is set to `,` by default
+### Normal mode
 
 - `<leader>tr` - Toggle right panel
 - `<leader>DD` - Toggle dark theme
@@ -63,7 +63,7 @@ The `<leader>` key is set to `,` by default
 - `<C-p>` - Searches MRU files with CtrlP
 - `<C-f>f` - Searches git files ,. mnemonic: find files
 - `<C-f>Y` - Searches git branches with ,. mnemonic: find Y (branch sign)
-- `<C-f>b` - Searches recently opened buffers,. mnemonic: find buffers
+- `<C-f>b` - Searches for buffers opened recently,. mnemonic: find buffers
 - `:Rg <search-term>` - fuzzy search for a term in the project. `<search-term>`
   can be a regular expression to search powerfully. uses
   [Ripgrep](https://github.com/BurntSushi/ripgrep) with [FZF](https://github.com/junegunn/fzf)
@@ -98,7 +98,7 @@ The `<leader>` key is set to `,` by default
 
 - `:LazyGit` - open embedded lazygit
 - `<leader>G` - open embedded lazygit
-- `:G` - open vim-fugitive git status window. A git repo alternatively to lazygit
+- `:G` - open vim-fugitive git status window. A git repo alternative to lazygit
 
 ### Others
 
@@ -109,11 +109,11 @@ The `<leader>` key is set to `,` by default
 ## Screenshots (carbonfox colorscheme)
 
 Definitions and References provided by language servers
-<img width="1792" alt="Screenshot 2021-11-11 at 19 09 49" src="./examples/Workspace3.png">
+![image](examples/Workspace3.png)
 
 Embedded lazygit view
 
-<img width="1792" alt="Screenshot 2021-11-11 at 19 09 49" src="./examples/Workspace4.png">
+![image](examples/Workspace4.png)
 
 ## Advanced
 
diff --git a/examples/CSS.css b/examples/CSS.css
@@ -0,0 +1,51 @@
+.background {
+  background-color: #f1f1f1;
+  padding: 20px;
+  border-radius: 10px;
+  margin-top: 20px;
+}
+
+.container {
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 10px;
+  margin-top: 20px;
+}
+
+#form {
+  margin-top: 20px;
+}
+
+.btn,
+.btn2 {
+  background-color: #4caf50;
+  color: white;
+  padding: 10px 20px;
+  border: none;
+  border-radius: 5px;
+  cursor: pointer;
+}
+
+.btn2 {
+  background-color: #f44336;
+}
+
+.btn:hover,
+.btn2:hover {
+  background-color: #45a049;
+}
+
+.overlay {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.7);
+  transition: opacity 500ms;
+  visibility: hidden;
+  opacity: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
diff --git a/examples/JAVA.java b/examples/JAVA.java
@@ -1,66 +1,79 @@
 public class AccountData {
-   
-    public List<Monthly_Financial_Account_Data__c> createNewFinincial(String dateId){
-         // add the latest date to the balances latest date
-        List<Monthly_Financial_Account_Data__c> subList = new List<Monthly_Financial_Account_Data__c>();
-        if(financialAccountDataList != null && !financialAccountDataList.isEmpty()){
-            for(Monthly_Financial_Account_Data__c monthlyAcount : financialAccountDataList) {
-                Monthly_Financial_Account_Data__c financialAccount;
-                financialAccount = new Monthly_Financial_Account_Data__c();
-                financialAccount.User_Updated__c = false;
-                financialAccount.Copy_Forward__c = true;
-                financialAccount.Previous_Month__c = monthlyAcount.Id;
-                financialAccount.Current_Balance__c = monthlyAcount.Current_Balance__c;
-                financialAccount.Financial_Accounts__c = monthlyAcount.Financial_Accounts__r.Id;
-                financialAccount.Interest_Rate__c = monthlyAcount.Interest_Rate__c;
-                financialAccount.CC_Limit_Orig_Loan_Amt__c = monthlyAcount.CC_Limit_Orig_Loan_Amt__c;
-                financialAccount.Date__c = dateId;
-                financialAccount.Name = monthlyAcount.Name;
-                financialAccount.Subtype__c = monthlyAcount.Subtype__c;
-                financialAccount.Productive_Debt__c = monthlyAcount.Productive_Debt__c;
-                financialAccount.Urgent_Debt__c = monthlyAcount.Urgent_Debt__c;
-                financialAccount.Collections_Charge_offs__c = monthlyAcount.Collections_Charge_offs__c;
-                financialAccount.RecordTypeId = monthlyAcount.RecordTypeId;
-                financialAccount.Record_Type_Name__c = monthlyAcount.Record_Type_Name__c;
-                financialAccount.Monthly_Minimum_Payment__c = monthlyAcount.Monthly_Minimum_Payment__c;
-                financialAccount.Deposits__c = null;
-                subList.add(financialAccount);
-            }
-        }
-       return subList;
+
+  public List<Monthly_Financial_Account_Data__c>
+  createNewFinincial(String dateId) {
+    // add the latest date to the balances latest date
+    List<Monthly_Financial_Account_Data__c> subList =
+        new List<Monthly_Financial_Account_Data__c>();
+    if (financialAccountDataList != null &&
+        !financialAccountDataList.isEmpty()) {
+      for (Monthly_Financial_Account_Data__c monthlyAcount :
+           financialAccountDataList) {
+        Monthly_Financial_Account_Data__c financialAccount;
+        financialAccount = new Monthly_Financial_Account_Data__c();
+        financialAccount.User_Updated__c = false;
+        financialAccount.Copy_Forward__c = true;
+        financialAccount.Previous_Month__c = monthlyAcount.Id;
+        financialAccount.Current_Balance__c = monthlyAcount.Current_Balance__c;
+        financialAccount.Financial_Accounts__c =
+            monthlyAcount.Financial_Accounts__r.Id;
+        financialAccount.Interest_Rate__c = monthlyAcount.Interest_Rate__c;
+        financialAccount.CC_Limit_Orig_Loan_Amt__c =
+            monthlyAcount.CC_Limit_Orig_Loan_Amt__c;
+        financialAccount.Date__c = dateId;
+        financialAccount.Name = monthlyAcount.Name;
+        financialAccount.Subtype__c = monthlyAcount.Subtype__c;
+        financialAccount.Productive_Debt__c = monthlyAcount.Productive_Debt__c;
+        financialAccount.Urgent_Debt__c = monthlyAcount.Urgent_Debt__c;
+        financialAccount.Collections_Charge_offs__c =
+            monthlyAcount.Collections_Charge_offs__c;
+        financialAccount.RecordTypeId = monthlyAcount.RecordTypeId;
+        financialAccount.Record_Type_Name__c =
+            monthlyAcount.Record_Type_Name__c;
+        financialAccount.Monthly_Minimum_Payment__c =
+            monthlyAcount.Monthly_Minimum_Payment__c;
+        financialAccount.Deposits__c = null;
+        subList.add(financialAccount);
+      }
     }
+    return subList;
+  }
 
-    public List<Monthly_Budget_Data__c> createNewBudgetFinincial(String dateId){
-        // add the latest date to the balances latest date
-        List<Monthly_Budget_Data__c> subList = new List<Monthly_Budget_Data__c>();
-        if(budgetDataList != null && !budgetDataList.isEmpty()){
-            for(Monthly_Budget_Data__c monthlyBudget : budgetDataList) {
-                if(monthlyBudget.Income_Frequency__c != "One-Time/Non-Recurring") {
-                    Monthly_Budget_Data__c budgetAccount;
-                    budgetAccount = new Monthly_Budget_Data__c();
-                    budgetAccount.Budgets__c = monthlyBudget.Budgets__r.Id;
-                    budgetAccount.User_Updated__c = false;
-                    budgetAccount.Previous_Month__c = monthlyBudget.Id;
-                    budgetAccount.Copy_Forward__c = true;
-                    budgetAccount.Gross_Amount__c = monthlyBudget.Gross_Amount__c;
-                    budgetAccount.Monthly_Actual_Amount__c = monthlyBudget.Monthly_Actual_Amount__c;
-                    budgetAccount.RecordTypeId = monthlyBudget.RecordTypeId;
-                    budgetAccount.Name = monthlyBudget.Name;
-                    budgetAccount.Savings_Goal_Due_Date__c = monthlyBudget.Savings_Goal_Due_Date__c;
-                    budgetAccount.Date__c = dateId;
-                    budgetAccount.Take_Home_Amount__c = monthlyBudget.Take_Home_Amount__c;
-                    budgetAccount.Income_Frequency__c = monthlyBudget.Income_Frequency__c;
-                    budgetAccount.Monthly_Expected_Amount__c = monthlyBudget.Monthly_Expected_Amount__c;
-                    budgetAccount.Record_Type_Name__c = monthlyBudget.Record_Type_Name__c;
-                    budgetAccount.Savings_Goal_Amount__c = monthlyBudget.Savings_Goal_Amount__c;
-                    budgetAccount.Total_Amount_Saved_for_Goal__c = monthlyBudget.Total_Amount_Saved_for_Goal__c;
-                    budgetAccount.Target_Monthly_Savings__c = monthlyBudget.Target_Monthly_Savings__c;
-                    subList.add(budgetAccount);
-                }
-            }
+  public List<Monthly_Budget_Data__c> createNewBudgetFinincial(String dateId) {
+    // add the latest date to the balances latest date
+    List<Monthly_Budget_Data__c> subList = new List<Monthly_Budget_Data__c>();
+    if (budgetDataList != null && !budgetDataList.isEmpty()) {
+      for (Monthly_Budget_Data__c monthlyBudget : budgetDataList) {
+        if (monthlyBudget.Income_Frequency__c != "One-Time/Non-Recurring") {
+          Monthly_Budget_Data__c budgetAccount;
+          budgetAccount = new Monthly_Budget_Data__c();
+          budgetAccount.Budgets__c = monthlyBudget.Budgets__r.Id;
+          budgetAccount.User_Updated__c = false;
+          budgetAccount.Previous_Month__c = monthlyBudget.Id;
+          budgetAccount.Copy_Forward__c = true;
+          budgetAccount.Gross_Amount__c = monthlyBudget.Gross_Amount__c;
+          budgetAccount.Monthly_Actual_Amount__c =
+              monthlyBudget.Monthly_Actual_Amount__c;
+          budgetAccount.RecordTypeId = monthlyBudget.RecordTypeId;
+          budgetAccount.Name = monthlyBudget.Name;
+          budgetAccount.Savings_Goal_Due_Date__c =
+              monthlyBudget.Savings_Goal_Due_Date__c;
+          budgetAccount.Date__c = dateId;
+          budgetAccount.Take_Home_Amount__c = monthlyBudget.Take_Home_Amount__c;
+          budgetAccount.Income_Frequency__c = monthlyBudget.Income_Frequency__c;
+          budgetAccount.Monthly_Expected_Amount__c =
+              monthlyBudget.Monthly_Expected_Amount__c;
+          budgetAccount.Record_Type_Name__c = monthlyBudget.Record_Type_Name__c;
+          budgetAccount.Savings_Goal_Amount__c =
+              monthlyBudget.Savings_Goal_Amount__c;
+          budgetAccount.Total_Amount_Saved_for_Goal__c =
+              monthlyBudget.Total_Amount_Saved_for_Goal__c;
+          budgetAccount.Target_Monthly_Savings__c =
+              monthlyBudget.Target_Monthly_Savings__c;
+          subList.add(budgetAccount);
         }
-        return subList;
+      }
     }
-   
+    return subList;
+  }
 }
-
diff --git a/examples/csharp.cs b/examples/csharp.cs
@@ -0,0 +1,80 @@
+public class AccountData {
+
+  public List<Monthly_Financial_Account_Data__c>
+  createNewFinincial(String dateId) {
+    // add the latest date to the balances latest date
+    List<Monthly_Financial_Account_Data__c> subList =
+        new List<Monthly_Financial_Account_Data__c>();
+    if (financialAccountDataList != null &&
+        !financialAccountDataList.isEmpty()) {
+      for (Monthly_Financial_Account_Data__c
+               monthlyAcount: financialAccountDataList) {
+        Monthly_Financial_Account_Data__c financialAccount;
+        financialAccount = new Monthly_Financial_Account_Data__c();
+        financialAccount.User_Updated__c = false;
+        financialAccount.Copy_Forward__c = true;
+        financialAccount.Previous_Month__c = monthlyAcount.Id;
+        financialAccount.Current_Balance__c = monthlyAcount.Current_Balance__c;
+        financialAccount.Financial_Accounts__c =
+            monthlyAcount.Financial_Accounts__r.Id;
+        financialAccount.Interest_Rate__c = monthlyAcount.Interest_Rate__c;
+        financialAccount.CC_Limit_Orig_Loan_Amt__c =
+            monthlyAcount.CC_Limit_Orig_Loan_Amt__c;
+        financialAccount.Date__c = dateId;
+        financialAccount.Name = monthlyAcount.Name;
+        financialAccount.Subtype__c = monthlyAcount.Subtype__c;
+        financialAccount.Productive_Debt__c = monthlyAcount.Productive_Debt__c;
+        financialAccount.Urgent_Debt__c = monthlyAcount.Urgent_Debt__c;
+        financialAccount.Collections_Charge_offs__c =
+            monthlyAcount.Collections_Charge_offs__c;
+        financialAccount.RecordTypeId = monthlyAcount.RecordTypeId;
+        financialAccount.Record_Type_Name__c =
+            monthlyAcount.Record_Type_Name__c;
+        financialAccount.Monthly_Minimum_Payment__c =
+            monthlyAcount.Monthly_Minimum_Payment__c;
+        financialAccount.Deposits__c = null;
+        subList.add(financialAccount);
+      }
+    }
+    return subList;
+  }
+
+  public List<Monthly_Budget_Data__c> createNewBudgetFinincial(String dateId) {
+    // add the latest date to the balances latest date
+    List<Monthly_Budget_Data__c> subList = new List<Monthly_Budget_Data__c>();
+    if (budgetDataList != null && !budgetDataList.isEmpty()) {
+      for (Monthly_Budget_Data__c monthlyBudget: budgetDataList) {
+
+        if (monthlyBudget.Income_Frequency__c != "One-Time/Non-Recurring") {
+          Monthly_Budget_Data__c budgetAccount;
+          budgetAccount = new Monthly_Budget_Data__c();
+          budgetAccount.Budgets__c = monthlyBudget.Budgets__r.Id;
+          budgetAccount.User_Updated__c = false;
+          budgetAccount.Previous_Month__c = monthlyBudget.Id;
+          budgetAccount.Copy_Forward__c = true;
+          budgetAccount.Gross_Amount__c = monthlyBudget.Gross_Amount__c;
+          budgetAccount.Monthly_Actual_Amount__c =
+              monthlyBudget.Monthly_Actual_Amount__c;
+          budgetAccount.RecordTypeId = monthlyBudget.RecordTypeId;
+          budgetAccount.Name = monthlyBudget.Name;
+          budgetAccount.Savings_Goal_Due_Date__c =
+              monthlyBudget.Savings_Goal_Due_Date__c;
+          budgetAccount.Date__c = dateId;
+          budgetAccount.Take_Home_Amount__c = monthlyBudget.Take_Home_Amount__c;
+          budgetAccount.Income_Frequency__c = monthlyBudget.Income_Frequency__c;
+          budgetAccount.Monthly_Expected_Amount__c =
+              monthlyBudget.Monthly_Expected_Amount__c;
+          budgetAccount.Record_Type_Name__c = monthlyBudget.Record_Type_Name__c;
+          budgetAccount.Savings_Goal_Amount__c =
+              monthlyBudget.Savings_Goal_Amount__c;
+          budgetAccount.Total_Amount_Saved_for_Goal__c =
+              monthlyBudget.Total_Amount_Saved_for_Goal__c;
+          budgetAccount.Target_Monthly_Savings__c =
+              monthlyBudget.Target_Monthly_Savings__c;
+          subList.add(budgetAccount);
+        }
+      }
+    }
+    return subList;
+  }
+}
diff --git a/v2/nvim/init.lua b/v2/nvim/init.lua
@@ -9,8 +9,7 @@ require("johnmutuma.plugins.bufferline")
 require("johnmutuma.plugins.lualine")
 require("johnmutuma.plugins.nvim-cmp")
 require("johnmutuma.plugins.telescope")
--- swap order to toggle <C-n> handler
-require("johnmutuma.plugins.nerdtree")
+-- require("johnmutuma.plugins.nerdtree")
 require("johnmutuma.plugins.nvim-tree")
 
 -- - LSP
@@ -20,7 +19,7 @@ require("johnmutuma.plugins.lsp.coc-nvim")
 require("johnmutuma.plugins.lsp.lspsaga")
 require("johnmutuma.plugins.lsp.lsp-lens")
 require("johnmutuma.plugins.lsp.gitsigns")
-require("johnmutuma.plugins.lsp.null-ls") -- now called none-ls.nvim
+require("johnmutuma.plugins.lsp.null-ls") -- now uses none-ls.nvim
 require("johnmutuma.plugins.dap.nvim-dap-ui")
 require("johnmutuma.plugins.dap.nvim-dap")
 require("johnmutuma.plugins.lazygit")
diff --git a/v2/nvim/lua/johnmutuma/core/colorscheme.lua b/v2/nvim/lua/johnmutuma/core/colorscheme.lua
@@ -26,6 +26,6 @@ local success_colorscheme, _ = pcall(vim.cmd, "colorscheme carbonfox")
 -- local success_colorscheme, _ = pcall(vim.cmd, "colorscheme dawnfox")
 
 if not success_colorscheme then
-	print("Colorscheme not found")
-	return
+  print("Colorscheme not found")
+  return
 end
diff --git a/v2/nvim/lua/johnmutuma/core/keymaps.lua b/v2/nvim/lua/johnmutuma/core/keymaps.lua
@@ -31,17 +31,8 @@ keymap.set("n", "k", "gk")
 keymap.set("n", "<leader>ww", ":noautocmd w<CR>")
 keymap.set("n", "<leader>w<CR>", ":noautocmd w<CR>")
 
--- Plugins mappings
--- -- telescope
-local builtin = require("telescope.builtin")
--- keymap.set("n", "<C-F>f", builtin.find_files, {})
--- keymap.set("n", "<C-F>s", builtin.live_grep, {})
--- keymap.set("n", "<C-F>b", builtin.buffers, {})
-keymap.set("n", "<C-F>h", builtin.help_tags, {})
-keymap.set("n", "<C-F>y", ":GBranches<CR>", {})
--- keymap.set("n", "<C-F>y", builtin.git_branches, {})
-
 -- fzf.vim
 keymap.set("n", "<C-F>f", ":GFiles<CR>", {})
+keymap.set("n", "<C-F>y", ":GBranches<CR>", {})
 keymap.set("n", "<C-F>s", "Rg ", {})
 keymap.set("n", "<C-F>b", ":Buffers<CR>", {})
diff --git a/v2/nvim/lua/johnmutuma/plugins/telescope.lua b/v2/nvim/lua/johnmutuma/plugins/telescope.lua
diff --git a/v2/nvim/plugin/packer_compiled.lua b/v2/nvim/plugin/packer_compiled.lua
