Added border-radius to snackbar, run complexity reports. Upped Versio…

…n. With minor change due to new data format
confused-Techie · Jan 21, 2022 · f3d1897 · f3d1897
1 parent 14426c1
commit f3d1897
Show file tree

Hide file tree

Showing 6 changed files with 444 additions and 216 deletions.
diff --git a/assets/css/universal.css b/assets/css/universal.css
@@ -309,7 +309,7 @@ footer p {
   width: 100%;
   background-color: var(--card-back-drop-colour);
   text-align: center;
-  border-radius: 3px;
+  border-radius: 5px;
   margin-top: 10px;
   margin-bottom: 10px;
   padding: 15px 5px 20px 5px;
@@ -331,6 +331,7 @@ footer p {
   z-index: 1;
   left: 50%;
   bottom: 30px;
+  border-radius: 5px;
 }
 
 .snackbar.show {

diff --git a/installer/GoPage.iss b/installer/GoPage.iss
@@ -6,7 +6,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{4322BAAB-9BD4-47F4-8F3C-471B1951D1F8}
 AppName=GoPage
-AppVersion=0.3.2
+AppVersion=0.4
 AppPublisher=LHBasics
 AppPublisherURL=https://www.lhbasics.com/
 AppSupportURL=https://github.com/confused-Techie/GoPage
@@ -29,7 +29,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "D:\Personal Documents\Github Repositories\GoPage\binaries\GoPage-v0.3.2.exe"; DestDir: "{app}"; DestName: "GoPage.exe"; Flags: ignoreversion
+Source: "D:\Personal Documents\Github Repositories\GoPage\binaries\GoPage-v0.4.exe"; DestDir: "{app}"; DestName: "GoPage.exe"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 ; Below we will instead specify directories instead of individual files 
 Source: "D:\Personal Documents\Github Repositories\GoPage\templates\*"; DestDir: "{app}\templates"; Flags: ignoreversion
@@ -44,32 +44,10 @@ Source: "D:\Personal Documents\Github Repositories\GoPage\assets\lang\*"; DestDi
 ; Then the next to lines transfer configuration data to the app dir
 Source: "D:\Personal Documents\Github Repositories\GoPage\cleanFiles\config.yml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "D:\Personal Documents\Github Repositories\GoPage\cleanFiles\list.json"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\Personal Documents\Github Repositories\GoPage\cleanFiles\userSettings.json"; DestDir: "{app}"; Flags: ignoreversion
 ; Finally we transfer the windows init script properly to edit the configuration file
 Source: "D:\Personal Documents\Github Repositories\GoPage\scripts\windowsInit.ps1"; DestDir: "{app}"; Flags: ignoreversion 
 
-;Source: "D:\Personal Documents\Github Repositories\GoPage\templates\editPage.html"; DestDir: "{app}\templates"; Flags: ignoreversion
-;Source: "D:\Personal Documents\Github Repositories\GoPage\templates\error.html"; DestDir: "{app}\templates"; Flags: ignoreversion
-;Source: "D:\Personal Documents\Github Repositories\GoPage\templates\homePage.html"; DestDir: "{app}\templates"; Flags: ignoreversion
-;Source: "D:\Personal Documents\Github Repositories\GoPage\templates\newItem.html"; DestDir: "{app}\templates"; Flags: ignoreversion
-; The above is for all template items 
-;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\css\form.css"; DestDir: "{app}\assets\css"; Flags: ignoreversion
-;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\css\home.css"; DestDir: "{app}\assets\css"; Flags: ignoreversion
-; The above is for CSS items 
-;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\js\form.js"; DestDir: "{app}\assets\js"; Flags: ignoreversion
-;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\js\home.js"; DestDir: "{app}\assets\js"; Flags: ignoreversion 
-; The above is for JS items
-;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\edit.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
-;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\git-branch-white.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
-;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\github.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
-;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\github-white.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
-;Source: "D:\Personal Documents\Github Repositories\GoPage\assets\images\trash-2.svg"; DestDir: "{app}\assets\images"; Flags: ignoreversion
-; The above is for image items
-;Source: "D:\Personal Documents\Github Repositories\GoPage\cleanFiles\config.yml"; DestDir: "{app}"; Flags: ignoreversion
-;Source: "D:\Personal Documents\Github Repositories\GoPage\cleanFiles\list.json"; DestDir: "{app}"; Flags: ignoreversion 
-; The above is for config file && data file
-;Source: "D:\Personal Documents\Github Repositories\GoPage\scripts\windowsInit.ps1"; DestDir: "{app}"; Flags: ignoreversion
-
-
 [Dirs]
 ; To create the empty userImages Dir 
 Name: "{app}\assets\userImages" 

diff --git a/model/model.go b/model/model.go
@@ -156,8 +156,8 @@ func ServSettingSetLang(newLang string) (string, error) {
 
 // UserSetting struct is made to contain the JSON of User settings
 type UserSetting struct {
-	CustomBackground usrStgBck `json:"customBackground"`
-	HeaderPlugins usrStgHdrPlg `json:"headerPlugins"`
+	CustomBackground usrStgBck    `json:"customBackground"`
+	HeaderPlugins    usrStgHdrPlg `json:"headerPlugins"`
 }
 
 type usrStgBck struct {
@@ -169,15 +169,14 @@ type usrStgBck struct {
 
 type usrStgHdrPlg struct {
 	Right usrStgHdrPlgInner `json:"right"`
-	Left usrStgHdrPlgInner `json:"left"`
+	Left  usrStgHdrPlgInner `json:"left"`
 }
 
 type usrStgHdrPlgInner struct {
-	Name string `json:"name"`
+	Name    string `json:"name"`
 	Options string `json:"options"`
 }
 
-
 // UserSettingGet is to access and return the user settings json
 func UserSettingGet() (au *UserSetting) {
 	file, err := os.OpenFile(viper.GetString("directories.setting")+"/userSettings.json", os.O_RDWR|os.O_APPEND, 0666)