Browse Source

removed source.tar.gz file from repo, fixed GH actions

uifixes
Hunter Long 2 years ago
parent
commit
df8e1f73d9
  1. 3
      Makefile
  2. BIN
      frontend/public/banner.png
  3. 22
      frontend/public/base.gohtml
  4. BIN
      frontend/public/favicon.ico
  5. BIN
      frontend/public/favicon/android-icon-144x144.png
  6. BIN
      frontend/public/favicon/android-icon-192x192.png
  7. BIN
      frontend/public/favicon/android-icon-36x36.png
  8. BIN
      frontend/public/favicon/android-icon-48x48.png
  9. BIN
      frontend/public/favicon/android-icon-72x72.png
  10. BIN
      frontend/public/favicon/android-icon-96x96.png
  11. BIN
      frontend/public/favicon/apple-icon-114x114.png
  12. BIN
      frontend/public/favicon/apple-icon-120x120.png
  13. BIN
      frontend/public/favicon/apple-icon-144x144.png
  14. BIN
      frontend/public/favicon/apple-icon-152x152.png
  15. BIN
      frontend/public/favicon/apple-icon-180x180.png
  16. BIN
      frontend/public/favicon/apple-icon-57x57.png
  17. BIN
      frontend/public/favicon/apple-icon-60x60.png
  18. BIN
      frontend/public/favicon/apple-icon-72x72.png
  19. BIN
      frontend/public/favicon/apple-icon-76x76.png
  20. BIN
      frontend/public/favicon/apple-icon-precomposed.png
  21. BIN
      frontend/public/favicon/apple-icon.png
  22. 2
      frontend/public/favicon/browserconfig.xml
  23. BIN
      frontend/public/favicon/favicon-16x16.png
  24. BIN
      frontend/public/favicon/favicon-32x32.png
  25. BIN
      frontend/public/favicon/favicon-96x96.png
  26. BIN
      frontend/public/favicon/favicon.ico
  27. 41
      frontend/public/favicon/manifest.json
  28. BIN
      frontend/public/favicon/ms-icon-144x144.png
  29. BIN
      frontend/public/favicon/ms-icon-150x150.png
  30. BIN
      frontend/public/favicon/ms-icon-310x310.png
  31. BIN
      frontend/public/favicon/ms-icon-70x70.png
  32. BIN
      frontend/public/favicon/social.png
  33. 1
      frontend/public/index.html
  34. 2
      frontend/src/API.js
  35. BIN
      frontend/src/assets/banner.png
  36. BIN
      frontend/src/assets/logo.png
  37. 2
      frontend/src/forms/Setup.vue
  38. 2
      frontend/src/pages/Help.vue
  39. 2
      frontend/src/pages/Login.vue
  40. 2
      frontend/src/pages/NotFound.vue
  41. 3
      handlers/function.go
  42. 4
      handlers/routes.go
  43. 17
      source/source.go

3
Makefile

@ -146,10 +146,7 @@ frontend-build:
cd frontend && yarn && yarn build
@cp -r frontend/dist source/
@cp -r frontend/src/assets/scss source/dist/
@cp frontend/public/favicon.ico source/dist/
@cp frontend/public/robots.txt source/dist/
@cp frontend/public/banner.png source/dist/
@cp -r frontend/public/favicon source/dist/
@echo "Frontend build complete at ./source/dist"
yarn:

BIN
frontend/public/banner.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

22
frontend/public/base.gohtml

File diff suppressed because one or more lines are too long

BIN
frontend/public/favicon.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

BIN
frontend/public/favicon/android-icon-144x144.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

BIN
frontend/public/favicon/android-icon-192x192.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

BIN
frontend/public/favicon/android-icon-36x36.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
frontend/public/favicon/android-icon-48x48.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
frontend/public/favicon/android-icon-72x72.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

BIN
frontend/public/favicon/android-icon-96x96.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

BIN
frontend/public/favicon/apple-icon-114x114.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

BIN
frontend/public/favicon/apple-icon-120x120.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
frontend/public/favicon/apple-icon-144x144.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

BIN
frontend/public/favicon/apple-icon-152x152.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

BIN
frontend/public/favicon/apple-icon-180x180.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
frontend/public/favicon/apple-icon-57x57.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

BIN
frontend/public/favicon/apple-icon-60x60.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

BIN
frontend/public/favicon/apple-icon-72x72.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

BIN
frontend/public/favicon/apple-icon-76x76.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

BIN
frontend/public/favicon/apple-icon-precomposed.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

BIN
frontend/public/favicon/apple-icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

2
frontend/public/favicon/browserconfig.xml

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

BIN
frontend/public/favicon/favicon-16x16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
frontend/public/favicon/favicon-32x32.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
frontend/public/favicon/favicon-96x96.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

BIN
frontend/public/favicon/favicon.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

41
frontend/public/favicon/manifest.json

@ -1,41 +0,0 @@
{
"name": "Statping",
"icons": [
{
"src": "favicon\/android-icon-36x36.png",
"sizes": "36x36",
"type": "image\/png",
"density": "0.75"
},
{
"src": "favicon\/android-icon-48x48.png",
"sizes": "48x48",
"type": "image\/png",
"density": "1.0"
},
{
"src": "favicon\/android-icon-72x72.png",
"sizes": "72x72",
"type": "image\/png",
"density": "1.5"
},
{
"src": "favicon\/android-icon-96x96.png",
"sizes": "96x96",
"type": "image\/png",
"density": "2.0"
},
{
"src": "favicon\/android-icon-144x144.png",
"sizes": "144x144",
"type": "image\/png",
"density": "3.0"
},
{
"src": "favicon\/android-icon-192x192.png",
"sizes": "192x192",
"type": "image\/png",
"density": "4.0"
}
]
}

BIN
frontend/public/favicon/ms-icon-144x144.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

BIN
frontend/public/favicon/ms-icon-150x150.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

BIN
frontend/public/favicon/ms-icon-310x310.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

BIN
frontend/public/favicon/ms-icon-70x70.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

BIN
frontend/public/favicon/social.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

1
frontend/public/index.html

@ -5,7 +5,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1.0, user-scalable=0">
<base href="/">
<link rel="icon" type="image/x-icon" href="/favicon.ico">
<title>Statping</title>
</head>
<body>

2
frontend/src/API.js

@ -8,7 +8,7 @@ const tokenKey = "statping_auth";
class Api {
constructor() {
this.version = "0.90.74";
this.commit = "2612402a7782f28ca0b7fc10c941d8c4a1a5acc6";
this.commit = "2352cae85cb388437ae848c6acd0a658a4cd2d84";
}
async oauth() {

BIN
frontend/src/assets/banner.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 KiB

BIN
frontend/src/assets/logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 574 KiB

2
frontend/src/forms/Setup.vue

File diff suppressed because one or more lines are too long

2
frontend/src/pages/Help.vue

@ -2321,7 +2321,7 @@ OluFxewsEO0QNDrfFb+0gnjYlnGqOFcZjUMXbDdY5oLSPtXohynuTK1qyQ==
</div>
<div class="text-center small text-dim" v-pre>
Automatically generated from Statping's Wiki on 2020-12-18 10:22:03.386528 &#43;0000 UTC
Automatically generated from Statping's Wiki on 2020-12-20 09:31:51.335569 &#43;0000 UTC
</div>
</div>

2
frontend/src/pages/Login.vue

File diff suppressed because one or more lines are too long

2
frontend/src/pages/NotFound.vue

File diff suppressed because one or more lines are too long

3
handlers/function.go

@ -39,5 +39,8 @@ var handlerFuncs = func(w http.ResponseWriter, r *http.Request) template.FuncMap
"BasePath": func() string {
return basePath
},
"Icon": func() string {
return basePath
},
}
}

4
handlers/routes.go

@ -67,17 +67,13 @@ func Router() *mux.Router {
indexHandler := http.FileServer(http.Dir(dir + "/assets/"))
r.PathPrefix("/css/").Handler(http.StripPrefix(basePath, staticAssets("css")))
r.PathPrefix("/favicon/").Handler(http.StripPrefix(basePath, staticAssets("favicon")))
r.PathPrefix("/robots.txt").Handler(http.StripPrefix(basePath, indexHandler))
r.PathPrefix("/banner.png").Handler(http.StripPrefix(basePath, indexHandler))
} else {
tmplFileSrv := http.FileServer(source.TmplBox.HTTPBox())
tmplBoxHandler := http.StripPrefix(basePath, tmplFileSrv)
r.PathPrefix("/css/").Handler(http.StripPrefix(basePath, tmplFileSrv))
r.PathPrefix("/favicon/").Handler(http.StripPrefix(basePath, tmplFileSrv))
r.PathPrefix("/robots.txt").Handler(tmplBoxHandler)
r.PathPrefix("/banner.png").Handler(tmplBoxHandler)
}
r.PathPrefix("/js/").Handler(http.StripPrefix(basePath, http.FileServer(source.TmplBox.HTTPBox())))

17
source/source.go

@ -29,13 +29,11 @@ var (
"scss/mixin.scss",
"scss/mobile.scss",
"scss/variables.scss",
"banner.png",
"favicon.ico",
"robots.txt",
}
)
// Assets will load the Rice boxes containing the CSS, SCSS, favicon, and HTML files.
// Assets will load the Rice boxes containing the CSS, SCSS, and HTML files.
func Assets() error {
if utils.Params.GetBool("DISABLE_HTTP") {
return nil
@ -130,7 +128,7 @@ func OpenAsset(path string) string {
return data
}
// CreateAllAssets will dump HTML, CSS, SCSS, and favicon assets into the '/assets' directory
// CreateAllAssets will dump HTML, CSS, and SCSS assets into the '/assets' directory
func CreateAllAssets(folder string) error {
log.Infoln(fmt.Sprintf("Dump Statping assets into %s/assets", folder))
fp := filepath.Join
@ -141,13 +139,10 @@ func CreateAllAssets(folder string) error {
if err := MakePublicFolder(fp(folder, "assets", "css")); err != nil {
return err
}
if err := MakePublicFolder(fp(folder, "assets", "favicon")); err != nil {
return err
}
if err := MakePublicFolder(fp(folder, "assets", "scss")); err != nil {
return err
}
log.Infoln("Inserting scss, css, and favicon files into assets folder")
log.Infoln("Inserting scss, and css files into assets folder")
if err := CopyAllToPublic(TmplBox); err != nil {
log.Errorln(err)
@ -157,12 +152,6 @@ func CreateAllAssets(folder string) error {
if err := CopyToPublic(TmplBox, "", "robots.txt"); err != nil {
return err
}
if err := CopyToPublic(TmplBox, "", "banner.png"); err != nil {
return err
}
if err := CopyToPublic(TmplBox, "", "favicon.ico"); err != nil {
return err
}
log.Infoln("Compiling CSS from SCSS style...")
if err := CompileSASS(); err != nil {
return err

Loading…
Cancel
Save