From 84a9a0ccee713e26a28ff5e54ea3776085d93b5f Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Mon, 22 Jun 2020 01:48:59 +0200 Subject: Updating just like... a bunch of shit --- templates/core.html | 18 ++++ templates/repo/about.html | 133 +---------------------- templates/repo/base.html | 37 +++++++ templates/repo/details.html | 258 ++++++++++++++++++++++---------------------- 4 files changed, 191 insertions(+), 255 deletions(-) create mode 100644 templates/core.html create mode 100644 templates/repo/base.html (limited to 'templates') diff --git a/templates/core.html b/templates/core.html new file mode 100644 index 0000000..808dc4c --- /dev/null +++ b/templates/core.html @@ -0,0 +1,18 @@ + + + + + + + + {% block title %}{% endblock %} + + +
+ {% block content %}{% endblock %} + +
+
Generated by octopus v0.0.0
+
+ + diff --git a/templates/repo/about.html b/templates/repo/about.html index b98edbd..5c476aa 100644 --- a/templates/repo/about.html +++ b/templates/repo/about.html @@ -1,131 +1,6 @@ - - - - - octopus | /spacekookie/octopus - - - - -
-
- -

spacekookie / octopus

-

šŸ™ It's a water animal

-
- Clone - Star - RSS -
-
- -
- +{% extends "base.html" %} -
-       .'.'
-      .'-'.
-  .  (  o O)
-   \_ `  _,   _
--.___'.) ( ,-'
-     '-.O.'-..-..       octopus git web frontend
- ./\/\/ | \_.-._
-        ;
-     ._/
+{% block child_content %}
+
{{ readme }}
+{% endblock %} - -A git web frontend that wants to hug your code. - - -Why? ----- - -This is a very good first question, and one that I think is important -to answer before getting more into the project. Whenever I brought up -this project during the creation of it, most people would react with -"have you tried...", followed by some git web software, such as -gitlab, gittea, and many many more. But there is a reason why I stuck -with octopus and the design ideas I had for it. - -Fundamentally it's about decentralisation. The internet is a pretty -big place (allegedly), but a lot of the services that people use are -very centralised by a single company or even server. If this company -or server goes away, so does valuable knowledge. There are many ways -to create more decentralised systems, and one aspect of this for me, -is code repos. - -Git is by it's nature decentralised, meaning that it doesn't require -an "upstream" or canonical server to function. Theoretically you -could use git to exchange code patches with people without the -internet. Yet, a lot of people's perception of git is one that is -dictated by the workflows on github and gitlab: centralised into a -single service. Many git web frontends mirror this workflow, because -after all, it is what people want and love. - -However, it has some flaws (which would take too long to elaborate -here), and for octopus I had something else in mind. Instead of -replicating the same mistakes, I took much more inspiration from cgit, -which is used and loved by many today. - -Octopus is a re-imagining of cgit, trying to improve the UX and -maintainability where possible, adding new features, but mostly -staying true to it's core: a simple git web service, that doesn't lock -you into a vendor, or server. - -Configuration -------------- - -octopus is easy to configure and run, even on systems that don't give -you priviledged system access. The main server binary is configured -primarily with a few environment variables, and an app config. - -+ OCTOPUS_CONFIG should contain the path of the main configuration - -+ OCTOPUS_SSL_KEY can optionally be set to the path of a certificate key - -+ OCTOPUS_SSL_CERT can optionally be set to the path of a certificate - - -The main configuration file is written in yaml, and outlines things -like the application domain, repo paths, and added modules. Because -octopus is vory modular, you can only depend on certain features. - - ---- -app_path: git.octopus.example -port: 8080 -handle_ssl: false -cache_path: /var/cache/octopus -repo_path: /var/lib/octopus/repos -repo_discovery: false # Disables automatic config loading from repo_path - # and instead let's you set a static set of repos - # in the section below -repos: - - octopus: - description: "šŸ™ It's a water animal" - category: "/" - - libkookie: - description: "My personal nix expressions" - category: "/nix" - - -
-
- - diff --git a/templates/repo/base.html b/templates/repo/base.html new file mode 100644 index 0000000..9927a4a --- /dev/null +++ b/templates/repo/base.html @@ -0,0 +1,37 @@ +{% extends "../core.html" %} +{% block title %}octopus | /{{ repo.data.owner }}/{{ repo.data.name }}{% endblock %} + +{% block content %} +
+ +

{{ repo.data.owner }} / {{ repo.data.name }}

+

šŸ™ It's a water animal

+
+ Clone + Star + RSS +
+
+ +
+ + +{% block child_content %}{% endblock %} + +{% endblock %} diff --git a/templates/repo/details.html b/templates/repo/details.html index ddcc761..6a13a77 100644 --- a/templates/repo/details.html +++ b/templates/repo/details.html @@ -1,126 +1,132 @@ - - - - - octopus | /spacekookie/octopus - - - - -
-
- -

spacekookie / octopus

-

šŸ™ It's a water animal

-
- Clone - Star - RSS -
-
- -
- - -
-

Branch

-

Commit message

-

Author

-

Date

- - fn-verify-9324832 - Updating to actix 2.0.0 and adding 404 handler -

Katharina Fey

-

5 months ago

- - master - Rebuilding the entire htlm and css styles -

Katharina Fey

-

18 hours ago

- - -

Commit Hash

-

Commit message

-

Author

-

Date

-

Lines

- - 270cb70 - Rebuilding the entire htlm and css stiles -

Katharina Fey

-

19 hours ago

-

-214/+75

- - 5db4c57 - Updating to actix 2.0.0 and adding 404 handler -

Katharina Fey

-

2020-01-23

-

-610/+455

- - 5e16c64 - Adding project documentation and roadmap planning -

Katharina Fey

-

2020-01-23

-

-3/+61

- - 8b38bdd - data: adding a small wrapper around libgit2 -

Katharina Fey

-

2019-12-29

-

-36/+32

- - c896fcd - material-ish design with gitea-style tabs -

Milan PƤssler

-

2019-12-29

-

-102/+169

- - f2f49bb - material-ish design with gitea-style tabs -

Milan PƤssler

-

2019-12-29

-

-1/+2

- - 4be56ee - Adding a small limgit2 example usage -

Katharina Fey

-

2019-12-29

-

-2/+17

- - 81ae20b - Refactoring basic project structure -

Katharina Fey

-

2019-12-28

-

-76/+209

- - baf496a - initial styling -

Milan PƤssler

-

2019-12-13

-

-38/+149

- - d43a02e - Adding AGPL-3.0 license -

Katharina Fey

-

2019-12-10

-

-0/+661

-
-
- - +{% extends "base.html" %} + +{% block child_content %} + + + + + + + + + + + {% for b in branches %} + + + + + + + {% endfor %} + +
BranchCommit messageAuthorDate
{{ b.name }}{{ b.last_commit.message }}{{ b.last_commit.author }}{{ b.last_commit.date }}
+ + + + + + + + + + + + + {% for c in commits %} + + + + + + + {% endfor %} + +
HashCommit messageAuthorDateLines
{{ c.hash }}{{ c.message }}{{ c.author }}{{ c.date }}
+ + +
+

Branch

+

Commit message

+

Author

+

Date

+ + fn-verify-9324832 + Updating to actix 2.0.0 and adding 404 handler +

Katharina Fey

+

5 months ago

+ + master + Rebuilding the entire htlm and css styles +

Katharina Fey

+

18 hours ago

+ + +

Commit Hash

+

Commit message

+

Author

+

Date

+

Lines

+ + 270cb70 + Rebuilding the entire htlm and css stiles +

Katharina Fey

+

19 hours ago

+

-214/+75

+ + 5db4c57 + Updating to actix 2.0.0 and adding 404 handler +

Katharina Fey

+

2020-01-23

+

-610/+455

+ + 5e16c64 + Adding project documentation and roadmap planning +

Katharina Fey

+

2020-01-23

+

-3/+61

+ + 8b38bdd + data: adding a small wrapper around libgit2 +

Katharina Fey

+

2019-12-29

+

-36/+32

+ + c896fcd + material-ish design with gitea-style tabs +

Milan PƤssler

+

2019-12-29

+

-102/+169

+ + f2f49bb + material-ish design with gitea-style tabs +

Milan PƤssler

+

2019-12-29

+

-1/+2

+ + 4be56ee + Adding a small limgit2 example usage +

Katharina Fey

+

2019-12-29

+

-2/+17

+ + 81ae20b + Refactoring basic project structure +

Katharina Fey

+

2019-12-28

+

-76/+209

+ + baf496a + initial styling +

Milan PƤssler

+

2019-12-13

+

-38/+149

+ + d43a02e + Adding AGPL-3.0 license +

Katharina Fey

+

2019-12-10

+

-0/+661

+
+ +{% endblock %} -- cgit v1.2.3