diff options
| author | xengineering <me@xengineering.eu> | 2023-01-11 20:02:10 +0100 |
|---|---|---|
| committer | xengineering <me@xengineering.eu> | 2023-01-11 20:51:13 +0100 |
| commit | 1f8b5c2bbe20c4c6b7b334b00ae5e6622dcd51f7 (patch) | |
| tree | 7fbff0112ca778aadad7baa988f502939dd11367 | |
| parent | 6b5857ee55af81b2f9effa8591f716591f79e5fd (diff) | |
| download | ceres-1f8b5c2bbe20c4c6b7b334b00ae5e6622dcd51f7.tar ceres-1f8b5c2bbe20c4c6b7b334b00ae5e6622dcd51f7.tar.zst ceres-1f8b5c2bbe20c4c6b7b334b00ae5e6622dcd51f7.zip | |
Switch to simple.css
This makes it easier to maintain and it looks better.
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | data/static/add.html | 19 | ||||
| l--------- | data/static/libweb.css | 1 | ||||
| l--------- | data/static/style.css | 1 | ||||
| -rw-r--r-- | data/templates/index.html | 25 | ||||
| -rw-r--r-- | data/templates/recipe.html | 25 | ||||
| m--------- | libweb | 0 | ||||
| m--------- | simple.css | 0 | ||||
| -rw-r--r-- | web/router.go | 2 |
10 files changed, 51 insertions, 30 deletions
diff --git a/.gitmodules b/.gitmodules index 13669d0..a3875af 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "libweb"] - path = libweb - url = https://cgit.xengineering.eu/libweb +[submodule "simple.css"] + path = simple.css + url = https://github.com/kevquirk/simple.css.git @@ -17,7 +17,7 @@ install: all install -Dm 644 config/default.json $(DESTDIR)/etc/ceres/config.json install -Dm 644 data/static/add.html $(DESTDIR)$(PREFIX)/share/ceres/static/add.html - install -Dm 644 data/static/libweb.css $(DESTDIR)$(PREFIX)/share/ceres/static/libweb.css + install -Dm 644 data/static/style.css $(DESTDIR)$(PREFIX)/share/ceres/static/style.css install -Dm 644 data/templates/index.html $(DESTDIR)$(PREFIX)/share/ceres/templates/index.html install -Dm 644 data/templates/recipe.html $(DESTDIR)$(PREFIX)/share/ceres/templates/recipe.html diff --git a/data/static/add.html b/data/static/add.html index ed02811..15d9f0e 100644 --- a/data/static/add.html +++ b/data/static/add.html @@ -8,24 +8,27 @@ <meta charset="utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="stylesheet" href="./static/libweb.css" type="text/css"> + <link rel="stylesheet" href="./static/style.css" type="text/css"> </head> <body> - <main> - + <header> <h1>Add a recipe</h1> + </header> + <main> <form action="/add_recipes" method="post"> - <label for="custom_title">Title:</label><br> - <input style="border: 1px solid;" type="text" id="custom_title" name="title"><br> - <label for="custom_link">Link (optional):</label><br> - <input style="border: 1px solid;" type="text" id="custom_link" name="url"><br> - <button class="card-last-item" type="submit">add</button> + <input placeholder="Title" type="text" id="custom_title" name="title"><br> + <input placeholder="Link (optional)" type="text" id="custom_link" name="url"><br> + <button type="submit">add</button> </form> + <footer> + <hr> + <p>The <a href="https://xengineering.eu/git/ceres">Ceres</a> recipe server is licensed under <a href="https://www.gnu.org/licenses/agpl-3.0.en.html">AGPL v3</a> and developed with <a href="https://simplecss.org/">simple.css</a>.</p> + </footer> </main> </body> diff --git a/data/static/libweb.css b/data/static/libweb.css deleted file mode 120000 index efe201e..0000000 --- a/data/static/libweb.css +++ /dev/null @@ -1 +0,0 @@ -../../libweb/libweb.css
\ No newline at end of file diff --git a/data/static/style.css b/data/static/style.css new file mode 120000 index 0000000..c954338 --- /dev/null +++ b/data/static/style.css @@ -0,0 +1 @@ +../../simple.css/simple.min.css
\ No newline at end of file diff --git a/data/templates/index.html b/data/templates/index.html index f216ed4..9115d31 100644 --- a/data/templates/index.html +++ b/data/templates/index.html @@ -8,22 +8,29 @@ <meta charset="utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="stylesheet" href="./static/libweb.css" type="text/css"> + <link rel="stylesheet" href="./static/style.css" type="text/css"> </head> <body> - <main> + <header> + <nav> + <a href="./add_recipes">add recipe</a> + </nav> <h1>Recipes</h1> - <button><a href="./add_recipes">add recipe</a></button> + </header> + + <main> <p>Here are the available recipes 😋🍳🍔🍕🥘</p> - {{range .}} - <a href="./recipe?id={{.Id}}"> - <div class="card"> - <h5 class="card-first-item" class="card-last-item">{{.Title}}</h5> - </div> - </a>{{end}} + <ul>{{range .}} + <li><a href="./recipe?id={{.Id}}">{{.Title}}</a></li>{{end}} + </ul> + + <footer> + <hr> + <p>The <a href="https://xengineering.eu/git/ceres">Ceres</a> recipe server is licensed under <a href="https://www.gnu.org/licenses/agpl-3.0.en.html">AGPL v3</a> and developed with <a href="https://simplecss.org/">simple.css</a>.</p> + </footer> </main> </body> diff --git a/data/templates/recipe.html b/data/templates/recipe.html index fcfdf67..536cac9 100644 --- a/data/templates/recipe.html +++ b/data/templates/recipe.html @@ -8,24 +8,35 @@ <meta charset="utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="stylesheet" href="../../../static/libweb.css" type="text/css"> + <link rel="stylesheet" href="../../../static/style.css" type="text/css"> </head> <body> - <main> + <header>{{if ne .UpstreamUrl ""}} + <nav> + <a href="{{.UpstreamUrl}}">Link to recipe</a> + </nav> + {{end}} <h1>{{.Title}}</h1> - <img src="./recipe/image?id={{.Id}}" alt="Recipe image">{{if ne .UpstreamUrl ""}} - <p><a href="{{.UpstreamUrl}}">Link to recipe</a></p>{{end}} + </header> + + <main> + <img src="./recipe/image?id={{.Id}}" alt="Recipe image"> <h2>Recipe description</h2> - <button id="editbtn" style="margin-top:20px;margin-bottom:20px;display:block" onclick=startEditMode()>edit</button> - <button id="cancelbtn" style="margin-top:20px;margin-bottom:20px;display:none" onclick=cancelEditMode()>abort</button> - <button id="savebtn" style="margin-top:20px;margin-bottom:20px;display:none" onclick=saveDescriptionMarkdown()>save</button> + <button id="editbtn" style="display:block" onclick=startEditMode()>edit</button> + <button id="cancelbtn" style="display:none" onclick=cancelEditMode()>abort</button> + <button id="savebtn" style="display:none" onclick=saveDescriptionMarkdown()>save</button> <pre id="description_md" style="display:none;" contenteditable="true">{{.DescriptionMarkdown}}</pre> <div id="rendered_description_md" style="display:block;"> {{.RenderedDescriptionMarkdown}} </div> + + <footer> + <hr> + <p>The <a href="https://xengineering.eu/git/ceres">Ceres</a> recipe server is licensed under <a href="https://www.gnu.org/licenses/agpl-3.0.en.html">AGPL v3</a> and developed with <a href="https://simplecss.org/">simple.css</a>.</p> + </footer> </main> <script> diff --git a/libweb b/libweb deleted file mode 160000 -Subproject d1e432e4bd53d5214fc2ac1fbb01393bf9c425f diff --git a/simple.css b/simple.css new file mode 160000 +Subproject 43a7f939f26b201a3413bcb7d7667a970d369e3 diff --git a/web/router.go b/web/router.go index b26dc88..5b972c2 100644 --- a/web/router.go +++ b/web/router.go @@ -18,7 +18,7 @@ func RunServer(config utils.HttpConfig, db *utils.Database) { http.HandleFunc("/add_recipes", add_recipes(db, config.Storage, config.Static)) - http.HandleFunc("/static/libweb.css", static("libweb.css", config.Static)) + http.HandleFunc("/static/style.css", static("style.css", config.Static)) http.HandleFunc("/favicon.ico", static("favicon.ico", config.Static)) address := config.Host + ":" + config.Port |