Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pages/link.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@
- [アイスの棒](https://azukibar.dev)
- [捻れたパピルス](https://www.hutinoatari.dev/)
- [つまみネット](https://trpfrog.net/)
- [ゆいのページ](https://yuino.dev/)

31 changes: 30 additions & 1 deletion pages/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,35 @@
img {
width: 800px;
@media (max-width: 600px) {
}

@media (max-width: 600px) {
img {
width: 100%;
}
}

#menu {
display: flex;
align-items: center;
gap: 16px;
flex-wrap: wrap;
}

#menu ul {
list-style: none;
display: flex;
gap: 12px;
margin: 0;
padding: 0;
}

#menu li {
margin: 0;
}

.request-changes {
display: flex;
margin-left: auto;
justify-content: flex-end;
align-items: center;
}
26 changes: 14 additions & 12 deletions pkg/framework/framework.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,37 +90,38 @@ func (p *Pages) AddPage(path string, page *Page) {
}

type Page struct {
Contents *mdparser.Root
Filename string
Path string
Contents *mdparser.Root
Filename string
Path string
OriginalPath string
}

func LoadLocalPages() (Pages, error) {
parser := mdparser.NewLineParser(nil)
pages := NewPages()
filepath.WalkDir("pages", func(path string, d os.DirEntry, err error) error {
filepath.WalkDir("pages", func(origPath string, d os.DirEntry, err error) error {
if err != nil {
return fmt.Errorf("error walking directory: %w", err)
}
if d.IsDir() {
return err
}
if filepath.Ext(path) != ".md" {
if filepath.Ext(origPath) != ".md" {
return nil
}
lines, err := os.ReadFile(path)
lines, err := os.ReadFile(origPath)
if err != nil {
fmt.Printf("error reading file, file=%v; %v\n", path, err)
fmt.Printf("error reading file, file=%v; %v\n", origPath, err)
return nil
}
md, err := parser.Parse(string(lines))
if err != nil {
fmt.Printf("error parsing markdown, file=%v: %v\n", path, err)
fmt.Printf("error parsing markdown, file=%v: %v\n", origPath, err)
return nil
}

//remove pages/ from path
path = path[len("pages/"):]
path := origPath[len("pages/"):]

//remove the extension from the path
path = path[:len(path)-len(filepath.Ext(path))]
Expand All @@ -141,9 +142,10 @@ func LoadLocalPages() (Pages, error) {
}

p := &Page{
Contents: md,
Filename: filename,
Path: path,
Contents: md,
Filename: filename,
Path: path,
OriginalPath: origPath,
}
pages.AddPage(path, p)

Expand Down
9 changes: 6 additions & 3 deletions pkg/generator/blog.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,12 @@ func (g *generator) generatePage() template.HTML {
return withDiv("content", template.HTML(buf.String()))
}

func (g *generator) generateMenu() template.HTML {
func (g *generator) generateMenu(page *framework.Page) template.HTML {
buf := new(bytes.Buffer)
g.templates.ExecuteTemplate(buf, "menu", g.config.Menu)
if page != nil {
g.templates.ExecuteTemplate(buf, "request_changes", fmt.Sprintf("https://github.com/gotti/gotti.dev/blob/main/%s", page.OriginalPath))
}
return withDiv("menu", template.HTML(buf.String()))
}

Expand All @@ -71,7 +74,7 @@ func (g *generator) generateLayout(md *mdparser.Root) template.HTML {
Body template.HTML
}{
Head: g.generateHeader(g.config.DefaultMetaData.WithDefault(title, md.MetaData.Thumbnail)),
Body: g.generateMenu() + g.generatePost(md.MetaData.Title, template.HTML(md.Objects.ToHTML())),
Body: g.generateMenu(nil) + g.generatePost(md.MetaData.Title, template.HTML(md.Objects.ToHTML())),
})
return template.HTML(buf.String())
}
Expand All @@ -87,7 +90,7 @@ func (t *postTemplateAddon) GeneratePage(page *framework.Page, pagehtml template
Body template.HTML
}{
Head: t.generateHeader(t.config.DefaultMetaData.WithDefault(meta.Title, meta.Thumbnail)),
Body: t.generateMenu() + t.generatePost(meta.Title, template.HTML(pagehtml)),
Body: t.generateMenu(page) + t.generatePost(meta.Title, template.HTML(pagehtml)),
})
return template.HTML(buf.String()), nil
}
2 changes: 1 addition & 1 deletion pkg/generator/page.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func (t *standalonePageAddon) GeneratePage(page *framework.Page, pagehtml templa
Body template.HTML
}{
Head: t.generateHeader(t.config.DefaultMetaData.WithDefault(meta.Title, meta.Thumbnail)),
Body: t.generateMenu() + t.generatePost(meta.Title, template.HTML(pagehtml)),
Body: t.generateMenu(page) + t.generatePost(meta.Title, template.HTML(pagehtml)),
})
return template.HTML(buf.String()), nil
}
1 change: 1 addition & 0 deletions pkg/generator/static/_layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<html lang="ja">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="/main.css">
{{.Head}}
</head>
Expand Down
5 changes: 5 additions & 0 deletions pkg/generator/static/_request_changes.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{{define "request_changes"}}
<div class="request-changes">
<a href="{{ . }}">Request Changes(GitHub)</a>
</div>
{{end}}
Loading