arnaucube/konstrui
1
0
Fork 0
mirror of https://github.com/arnaucube/konstrui.git synced 2026-02-06 19:16:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed replace simple vars. Next: konstruiRepeatElem, and clean code

Browse Source
This commit is contained in:
arnaucode
2017-10-09 12:16:43 +02:00
parent e0d30abc0e
commit 22dfd065b3
1 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
templating.go
View File

@@ -41,29 +41,21 @@ func replaceEntryOLD(templateContent string, entry dataEntry, jsonData *gabs.Con
func replaceEntry(templateContent string, entry dataEntry, jsonData *gabs.Container, elemName string) string { func replaceEntry(templateContent string, entry dataEntry, jsonData *gabs.Container, elemName string) string {
fmt.Println(jsonData) fmt.Println(jsonData)
children, _ := jsonData.S().ChildrenMap() children, _ := jsonData.S().ChildrenMap()
_, ok := jsonData.S().Children() //_, ok := jsonData.S().Children()
color.Green("AAAAAAAAAA") color.Green("AAAAAAAAAA")
fmt.Println(children)
fmt.Println(ok)
fmt.Println("-")
for parameter, child := range children { for parameter, child := range children {
subchildren, _ := child.S().ChildrenMap() //subchildren, _ := child.S().ChildrenMap()
_, ok := child.S().Children() _, ok := child.S().Children()
fmt.Println(parameter)
fmt.Println(child)
fmt.Println(ok)
if ok != nil { if ok != nil {
color.Green("child fin")
color.Blue(child.Data().(string)) color.Blue(child.Data().(string))
fmt.Println(child)
templateContent = strings.Replace(templateContent, "{{"+parameter+"}}", child.Data().(string), -1) templateContent = strings.Replace(templateContent, "{{"+parameter+"}}", child.Data().(string), -1)
} else { } else {
for subparameter, subchild := range subchildren { /*for subparameter, subchild := range subchildren {
color.Red(subchild.Data().(string)) color.Red(subchild.Data().(string))
fmt.Println(subchild) fmt.Println(subchild)
fmt.Println(subparameter) fmt.Println(subparameter)
//templateContent = strings.Replace(templateContent, "{{"+subparameter+"}}", subchild.Data().(string), -1) //templateContent = strings.Replace(templateContent, "{{"+subparameter+"}}", subchild.Data().(string), -1)
} }*/
} }
} }
@@ -125,9 +117,19 @@ func getElemFromObj(entry dataEntry, elemName string) []dataEntry {
} }
func konstruiSimpleVars(template string, entries []dataEntry, jsonData *gabs.Container) string { func konstruiSimpleVars(template string, entries []dataEntry, jsonData *gabs.Container) string {
//now, replace simple templating variables {{vars}} //now, replace simple templating variables {{vars}}
for _, entry := range entries { /*for _, entry := range entries {
template = replaceEntry(template, entry, jsonData, "") template = replaceEntry(template, entry, jsonData, "")
}*/
/*children, _ := jsonData.S().Children()
for _, child := range children {
var entry dataEntry
fmt.Println("aaaaa")
fmt.Println(child)
template = replaceEntry(template, entry, child, "")
} }
*/
var entry dataEntry
template = replaceEntry(template, entry, jsonData, "")
return template return template
} }
func konstruiTemplate(templateContent string) string { func konstruiTemplate(templateContent string) string {
@@ -186,14 +188,19 @@ func startTemplating(folderPath string, newDir string) {
//do templating for the file pages in konstruiConfig.RepeatPages //do templating for the file pages in konstruiConfig.RepeatPages
c.Cyan("starting to generate Pages to repeat") c.Cyan("starting to generate Pages to repeat")
for i := 0; i < len(konstruiConfig.RepeatPages); i++ { for i := 0; i < len(konstruiConfig.RepeatPages); i++ {
pageTemplate, data, jsonData := getHtmlAndDataFromRepeatPages(konstruiConfig.RepeatPages[i]) pageTemplate, _, jsonData := getHtmlAndDataFromRepeatPages(konstruiConfig.RepeatPages[i])
for j := 0; j < len(data); j++ { //for j := 0; j < len(data); j++ {
children, _ := jsonData.S().Children()
for _, child := range children {
var dataArray []dataEntry var dataArray []dataEntry
dataArray = append(dataArray, data[j]) var dat dataEntry
generatedPage := konstruiRepeatJSONPartTwo(pageTemplate, dataArray, jsonData, "") //dataArray = append(dataArray, data[j])
generatedPage = konstruiRepeatElem(generatedPage, dataArray[0], jsonData) generatedPage := konstruiRepeatJSONPartTwo(pageTemplate, dataArray, child, "")
generatedPage = konstruiSimpleVars(generatedPage, dataArray, jsonData) generatedPage = konstruiRepeatElem(generatedPage, dat, child)
writeFile(newDir+"/"+data[j]["pageName"]+"Page.html", generatedPage) generatedPage = konstruiSimpleVars(generatedPage, dataArray, child)
//writeFile(newDir+"/"+data[j]["pageName"]+"Page.html", generatedPage)
pageName, _ := child.Path("pageName").Data().(string)
writeFile(newDir+"/"+pageName+"Page.html", generatedPage)
} }
} }
//COPYRAW //COPYRAW