Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
0 results Searching
Select Git revision
Loading items
Show changes

Commits on Source 2

11 files
+ 530
− 6963
Compare changes
  • Side-by-side
  • Inline

Files

.idea/runConfigurations/minerva_serve_silicon.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
    <module name="minerva" />

    <working_directory value="$PROJECT_DIR$/application/source" />

    <useCustomBuildTags value="true" />

    <parameters value="serve --config=../../development/examples/theme1/config.yaml --path=$PROJECT_DIR$/../../alvine/application/platform-themes/silicon/application/web/" />

    <parameters value="serve --config=../../development/examples/theme1/config.yaml --path=$PROJECT_DIR$/../../alvine/application/platform-themes/spring/application/web/" />

    <kind value="DIRECTORY" />

    <directory value="$PROJECT_DIR$/application/source" />

    <filePath value="$PROJECT_DIR$" />

application/source/server/http-fs-debug.go

+4 −0
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ func getEditorScript() http.Handler { 
	})

}



func getEditorFileserver() http.Handler {

	return http.FileServer(http.Dir(webDistPath))

}



func getFileserver() http.Handler {

	c := config.GetConfiguration()

	return http.FileServer(http.Dir(c.Server.Path))

application/source/server/serve.go

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ func initRouting() *chi.Mux { 
	router.Handle("/scripts/main.js", getEditorScript())

	router.Handle("/styles/main.css", getEditorStyle())



	router.Handle("/editor/*", getEditorFileserver())

	router.Handle("/*", getFileserver())

	router.Get("/", redirectToApp())

	return router

application/source/server/web/dist/editor/site.webmanifest

+4 −4
Original line number Diff line number Diff line 
{

    "name": "",

    "short_name": "",

    "name": "Minerva Editor",

    "short_name": "Minerva",

    "icons": [

        {

            "src": "/android-chrome-192x192.png",

            "src": "/editor/android-chrome-192x192.png",

            "sizes": "192x192",

            "type": "image/png"

        },

        {

            "src": "/android-chrome-512x512.png",

            "src": "/editor/android-chrome-512x512.png",

            "sizes": "512x512",

            "type": "image/png"

        }