diff --git a/internal/blog/README.md b/internal/blog/README.md index 7683dde..bf5728b 100644 --- a/internal/blog/README.md +++ b/internal/blog/README.md @@ -58,6 +58,7 @@ Return: ```json { id: "blogID", + staticPage: false, // static pages don't show up alongside other blog pages. createTime: 0, // creation time in Unix format updateTime: 0, // last update time in Unix format author: "authorID", @@ -170,6 +171,7 @@ Return: [ { title: "Darkstorm Server", + order: 0, repository: "https://github.com/CalebQ42/darkstorm-server", description: "The backend that runs runs my website and APIs", technologies: [ // May be empty diff --git a/internal/blog/portfolio.go b/internal/blog/portfolio.go index de589fc..807f6f1 100644 --- a/internal/blog/portfolio.go +++ b/internal/blog/portfolio.go @@ -12,6 +12,7 @@ import ( type PortfolioProject struct { Title string `json:"_id" bson:"_id"` + Order int `json:"order" bson:"order"` Repository string `json:"repository" bson:"repository"` Description string `json:"description" bson:"description"` Technologies []string `json:"technologies" bson:"technologies"` @@ -26,7 +27,7 @@ func (b *BlogApp) Projects(languageFilter string) ([]PortfolioProject, error) { if languageFilter != "" { filter["language.language"] = languageFilter } - res, err := b.portfolioCol.Find(context.Background(), filter, options.Find().SetSort(bson.M{"_id": 1})) + res, err := b.portfolioCol.Find(context.Background(), filter, options.Find().SetSort(bson.M{"order": 1})) if err != nil { return nil, err } diff --git a/portfolio.go b/portfolio.go index 8f49d82..ff26845 100644 --- a/portfolio.go +++ b/portfolio.go @@ -14,6 +14,7 @@ const ( portfolioTitle = "

%v

" portfolioLink = "

%v: %v

" + portfolioTech = "

Tech: %v

" portfolioDesc = "

%v

" ) @@ -42,6 +43,7 @@ func portfolioRequest(w http.ResponseWriter, r *http.Request) { langs[l.Language] = struct{}{} out += fmt.Sprintf(portfolioLanguage, l.Language, l.Dates) } + out += fmt.Sprintf(portfolioTech, strings.Join(p.Technologies, ", ")) out += fmt.Sprintf(portfolioDesc, p.Description) } langKeys := make([]string, 0, len(langs))