Merge pull request #69 from Kirari04/deprecate/project-configs

feat(config): remove Project Name, Documentation and Download URLs (H…

Author: Kirari04

config/config.go

@@ -42,9 +42,6 @@ type Config struct {
 	AppName string
 	BaseUrl string
 
-	Project              string
-	ProjectDocumentation string
-	ProjectDownload      string
 	ProjectExampleVideo  string
 
 	JwtSecretKey       string
@@ -138,9 +135,8 @@ type Config struct {
 }
 
 type PublicConfig struct {
-	AppName         string
-	BaseUrl         string
-	Project         string
+	AppName string
+	BaseUrl string
 	EncodingEnabled bool
 	UploadEnabled   bool
 
@@ -168,7 +164,6 @@ func (c Config) PublicConfig() PublicConfig {
 	return PublicConfig{
 		AppName:         c.AppName,
 		BaseUrl:         c.BaseUrl,
-		Project:         c.Project,
 		EncodingEnabled: *c.EncodingEnabled,
 		UploadEnabled:   *c.UploadEnabled,
 

configdb/configdb.go

@@ -21,9 +21,6 @@ func Setup() {
 	config.ENV.AppName = getEnvDb(&setting.AppName, "VideoCMS")
 	config.ENV.BaseUrl = getEnvDb(&setting.BaseUrl, "http://127.0.0.1:3000")
 
-	config.ENV.Project = getEnvDb(&setting.Project, "https://github.com/notfound")
-	config.ENV.ProjectDocumentation = getEnvDb(&setting.ProjectDocumentation, "https://github.com/notfound")
-	config.ENV.ProjectDownload = getEnvDb(&setting.ProjectDownload, "https://github.com/notfound")
 	config.ENV.ProjectExampleVideo = getEnvDb(&setting.ProjectExampleVideo, "notfound")
 
 	config.ENV.JwtSecretKey = getEnvDb(&setting.JwtSecretKey, randomstring.CookieFriendlyString(64))

controllers/PlayerController.go

@@ -179,7 +179,6 @@ func PlayerController(c echo.Context) error {
 		"Webhooks":                     string(rawWebhooks),
 		"StreamIsReady":                streamIsReady,
 		"UUID":                         requestValidation.UUID,
-		"PROJECTURL":                   config.ENV.Project,
 		"Folder":                       config.ENV.FolderVideoQualitysPub,
 		"JWT":                          tkn,
 		"AppName":                      config.ENV.AppName,

controllers/UpdateSettingsController.go

@@ -27,9 +27,6 @@ func UpdateSettings(c echo.Context) error {
 	setting.ID = validation.ID
 	setting.AppName = validation.AppName
 	setting.BaseUrl = validation.BaseUrl
-	setting.Project = validation.Project
-	setting.ProjectDocumentation = validation.ProjectDocumentation
-	setting.ProjectDownload = validation.ProjectDownload
 	setting.ProjectExampleVideo = validation.ProjectExampleVideo
 	setting.JwtSecretKey = validation.JwtSecretKey
 	setting.JwtUploadSecretKey = validation.JwtUploadSecretKey

controllers/ViewIndexController.go

@@ -14,16 +14,12 @@ func ViewIndex(c echo.Context) error {
 	var link models.Link
 	if res := inits.DB.First(&link); res.Error != nil {
 		return c.Render(http.StatusOK, "index.html", echo.Map{
-			"ExampleVideo":         fmt.Sprintf("/%v", "notfound"),
-			"AppName":              config.ENV.AppName,
-			"ProjectDocumentation": config.ENV.ProjectDocumentation,
-			"ProjectDownload":      config.ENV.ProjectDownload,
+			"ExampleVideo": fmt.Sprintf("/%v", "notfound"),
+			"AppName":      config.ENV.AppName,
 		})
 	}
 	return c.Render(http.StatusOK, "index.html", echo.Map{
-		"ExampleVideo":         fmt.Sprintf("/%v", link.UUID),
-		"AppName":              config.ENV.AppName,
-		"ProjectDocumentation": config.ENV.ProjectDocumentation,
-		"ProjectDownload":      config.ENV.ProjectDownload,
+		"ExampleVideo": fmt.Sprintf("/%v", link.UUID),
+		"AppName":      config.ENV.AppName,
 	})
 }

models/Setting.go

@@ -7,13 +7,10 @@ type SettingValidation struct {
 
 type Setting struct {
 	Model
-	AppName string `validate:"required,min=1,max=120" gorm:"size:120;"`
-	BaseUrl string `validate:"required,min=1,max=255" gorm:"size:255;"`
+	AppName              string `validate:"required,min=1,max=120" gorm:"size:120;"`
+	BaseUrl              string `validate:"required,min=1,max=120" gorm:"size:120;"`
 
-	Project              string `validate:"required,min=1,max=512" gorm:"size:512;"`
-	ProjectDocumentation string `validate:"required,min=1,max=512" gorm:"size:512;"`
-	ProjectDownload      string `validate:"required,min=1,max=512" gorm:"size:512;"`
-	ProjectExampleVideo  string `validate:"required,min=1,max=512" gorm:"size:512;"`
+	ProjectExampleVideo string `validate:"required,min=1,max=512" gorm:"size:512;"`
 
 	JwtSecretKey       string `validate:"required,min=8,max=512" gorm:"size:512;"`
 	JwtUploadSecretKey string `validate:"required,min=8,max=512" gorm:"size:512;"`

views/index.html

@@ -14,10 +14,10 @@ <h1>{{.AppName}}</h1>
             <a target="_blank" href="{{.ExampleVideo}}">Example Video Player</a>
         </li>
         <li>
-            <a target="_blank" href="{{.ProjectDocumentation}}">Api Documentation</a>
+            <a target="_blank" href="https://videocms-docs.vercel.app/">Api Documentation</a>
         </li>
         <li>
-            <a target="_blank" href="{{.ProjectDownload}}">Docker Image / Download</a>
+            <a target="_blank" href="https://hub.docker.com/r/kirari04/videocms">Docker Image / Download</a>
         </li>   
         <li>
             <a target="_blank" href="examples/upload">Upload Example</a>

views/player.html

@@ -431,7 +431,7 @@
         if (Webhooks == null) Webhooks = [];
         const JWT = "{{.JWT}}";
         const UUID = "{{.UUID}}";
-        const PROJECTURL = "{{.PROJECTURL}}";
+
         const TITLE = "{{.Title}}";
         const StreamIsReady = ("{{.StreamIsReady}}" === "true");
         const FOLDER = "{{.Folder}}";