diff --git a/approutes/personalPropsRoute/personalPropsRoute.go b/approutes/personalPropsRoute/personalPropsRoute.go deleted file mode 100644 index 38d3ab5..0000000 --- a/approutes/personalPropsRoute/personalPropsRoute.go +++ /dev/null @@ -1,13 +0,0 @@ -package personalpropsroute - -import ( - "github.com/gin-gonic/gin" -) - -func Route(route *gin.RouterGroup) { - - // route.GET("/test", func(ctx *gin.Context) { - // test := persPropsApp.Render() - // ctx.HTML(http.StatusOK, "personal-properties.html", gin.H{"books": test}) - // }) -} diff --git a/main.go b/main.go index 6eea0fa..c6eabc3 100644 --- a/main.go +++ b/main.go @@ -3,9 +3,9 @@ package main import ( "log" "net/http" - personalpropsroute "personalwebsite/approutes/personalPropsRoute" "personalwebsite/routewde" "personalwebsite/websiteapp" + "personalwebsite/websiteapp/finder" "personalwebsite/websiteapp/personalprops" "github.com/gin-gonic/gin" @@ -39,10 +39,12 @@ func main() { }) persPropsApp := personalprops.NewPersPropsApp() + finderApp := finder.FinerApplication{} appsStorage := websiteapp.ApplicationsStorage{ Apps: map[string]websiteapp.WebDEApplication{}, } appsStorage.Apps["personal-properties"] = &persPropsApp + appsStorage.Apps["finder"] = &finderApp system := router.Group("system") { @@ -65,9 +67,9 @@ func main() { case "getmanifest": ctx.JSON(http.StatusOK, app.GetManifest()) case "app.js": - ctx.File("resources/" + appId + "/" + appId + ".js") + ctx.File("resources/sys/" + appId + "/" + appId + ".js") case "app.css": - ctx.File("resources/" + appId + "/" + appId + ".css") + ctx.File("resources/sys/" + appId + "/" + appId + ".css") default: ctx.Status(http.StatusBadRequest) } @@ -75,7 +77,7 @@ func main() { } websiteapp.Route(apps.Group("/storage"), &appsStorage) - personalpropsroute.Route(apps.Group("/personalproperties")) + // personalpropsroute.Route(apps.Group("/personalproperties")) } app := router.Group("application") diff --git a/resources/base.html b/pure-html/base.html similarity index 100% rename from resources/base.html rename to pure-html/base.html diff --git a/resources/basic-window.html b/pure-html/basic-window.html similarity index 100% rename from resources/basic-window.html rename to pure-html/basic-window.html diff --git a/pure-html/index.html b/pure-html/index.html index db576d8..3c5701f 100644 --- a/pure-html/index.html +++ b/pure-html/index.html @@ -1,10 +1,35 @@ - -
+ + -↓Scrollable!↓
+↓Scrollable!↓
+↓Scrollable!↓
+↓Scrollable!↓
+↓Scrollable!↓
+