~evanj/cms

c9b8ed8641d753b2adde17c7bac7995f94dff36b — Evan M Jones 4 months ago 4f9297f
Chore(e3/defaultDepth/redirect): Slight changes. Moving things around.
M cms.go => cms.go +2 -2
@@ 131,7 131,7 @@ func init() {
				cacher,
			),
			"file": file.New(
				log.New(w, "[cms:static] ", 0),
				log.New(w, "[cms:file] ", 0),
				cacher,
				fs,
				url,


@@ 142,7 142,7 @@ func init() {
				cacher,
			),
			"doc": doc.New(
				log.New(w, "[cms:redirect] ", 0),
				log.New(w, "[cms:doc] ", 0),
				cacher,
			),
		},

M internal/s/db/content.go => internal/s/db/content.go +0 -4
@@ 34,10 34,6 @@ func orderTypeReverse(o OrderType) OrderType {
	}
}

const (
	defaultDepth = 3 // For fetching reference types.
)

type Content struct {
	// In DB.
	ContentID           string

M internal/s/db/db.go => internal/s/db/db.go +4 -0
@@ 15,6 15,10 @@ const (
	// Default pagination amount. For use in LIMIT/OFFSET.
	perPage = 25

	// For fetching reference types.
	// maxDepth = 3 // Not used yet.
	defaultDepth = 2

	maxUint = ^uint(0)
	maxInt  = int(maxUint >> 1)
)

M internal/s/tmpl/html/redirect.html => internal/s/tmpl/html/redirect.html +1 -1
@@ 14,6 14,6 @@
    {{ template "html/_footer.html" }}
  </main>
  {{ template "html/_scripts.html" }}
  <script>(function(){setTimeout(function(){location.href="{{.URL}}";},750);})();</script>
  <script>(function(){setTimeout(function(){location.href="{{.URL}}";},250);})();</script>
</body>
</html>

M internal/s/tmpl/tmpls_embed.go => internal/s/tmpl/tmpls_embed.go +1 -1
@@ 38,7 38,7 @@ func init() {

	tmpls["html/index.html"] = tostring("<!DOCTYPE html>
<html lang=en>
<head>
  {{ template "html/_head.html" }}
  <title>CMS</title>
</head>
<body class='index bg-light'>
  <style>{{ template "css/main.css" }}</style>
  <main>
    {{ template "html/_header.html" $ }}
    <div class="pricing-header px-3 py-3 pt-md-5 pb-md-4 mx-auto text-center">
      <h1 class="display-4">CMS</h1>
      <p class="lead">An old-school content management <mark>infrastructure</mark> for most.</p>
    </div>
    <div class='container'>
      <div class='row'>
        <div class="col-12 offset-0 col-lg-8 offset-lg-2">
          <div class="alert alert-warning" role="alert">
            <p><strong>WARNING:</strong> This site is in <strong>ALPHA</strong>. 
            This site is a content management system/infrastructure. Meaning: 
            it's purpose is to allow users to generate content. That's a 
            dangerous thing. Instead of focusing on fighting abuse I'll be auto 
            deleting all content (except for my own) on a regular and tight 
            interval. You still might have fun poking around on this site. It's 
            also <a href='https://www.gnu.org/philosophy/floss-and-foss.en.html'>FLOSS,</a>
            so you can enjoy self-hosting yourself if you are so inclined. If you
            find bugs (you most likely will) or have feature requests please send 
            them my way. It is appreciated. Thank you.</p>
            <p>If you need to hit the API try cURL'ing any page you see in the 
            URL bar (include basic auth). A simple use case of consuming this site can be found on my 
            <a href='https://git.sr.ht/~evanj/evanjon.es/tree/master/pkg/cms/cms.go'>personal site</a>.</p>
          </div>
        </div>
      </div>
    </div>
    <article>
      {{ if .User }}
        <form method=POST action='/space' enctype='multipart/form-data'>
          <input type=hidden name=method value=POST />
          <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
            <div class="modal-dialog modal-dialog-scrollable">
              <div class="modal-content">
                <div class="modal-header">
                  <h5 class="modal-title" id="exampleModalLabel">Create a new space</h5>
                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                    <span aria-hidden="true">&times;</span>
                  </button>
                </div>
                <div class="modal-body">
                  <label for="spaceName">Name</label>
                  <input name=name type=text id="spaceName" class="mb-3 form-control" placeholder="Name" required>
                  <label for="spaceDesc">Description</label>
                  <input name=desc type=text id="spaceDesc" class="mb-3 form-control" placeholder="Description" required>
                </div>
                <div class="modal-footer">
                  <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
                  <button type="submit" class="btn btn-primary">Go</button>
                </div>
              </div>
            </div>
          </div>
        </form>
        <div class="container">
          <div class='row'>
            <div class='offset-lg-3 col-lg-6'>
              <div class="my-3 p-3 bg-white rounded shadow-sm">
                  <small class="d-block text-right float-right" data-toggle="modal" data-target="#exampleModal">
                    <a href="#">Create a new space</a>
                  </small>
                <h6 class="border-bottom border-gray pb-2 mb-0">Your spaces</h6>
                {{ if .Spaces.List }}
                  {{ range .Spaces.List }}
                  <div class="media text-muted pt-3">
                    <a href='/space/{{ .ID }}'  class="d-block media-body pb-3 mb-0 small lh-125 border-bottom border-gray">
                      <strong class="d-block text-gray-dark">{{ .Name }}</strong>
                      {{ .Desc }}
                    </a>
                  </div>
                  {{ end }}
                  {{ if .Spaces.More }}
                  <small class="d-block text-right mt-3">
                    <a href="/?before={{ .Spaces.Before }}">Load more</a>
                  </small>
                  {{ end }}
                {{ else }}
                  <div class="mt-3 alert alert-primary" role="alert">
                    You haven't created any spaces yet. 
                  </div>
                {{ end }}
              </div>
            </div>
          </div>
        </div>
      {{ else }}
        <div class="container">
          <div class='row justify-content-center'>
            <div class="col-12 col-md-6 col-lg-4 offset-col-lg-2 col-xl-3 offset-col-xl-3 d-flex">
              <div class="card mb-4 shadow-sm flex-fill">
                <div class="card-header">
                  <h4 class="my-0 font-weight-normal">Signup</h4>
                </div>
                <div class="card-body">
                  <form method=POST action='/user/signup' enctype='multipart/form-data'>
                    <label for="signupInputUsername" class="sr-only">Email address</label>
                    <input name=username type="text" id="signupInputUsername" class="mb-3 form-control" placeholder="Username" required>
                    <label for="signupInputPassword" class="sr-only">Password</label>
                    <input name=password type="password" id="signupInputPassword" class="mb-3 form-control" placeholder="Password" required>
                    <label for="signupInputVerify" class="sr-only">Confirm Password</label>
                    <input name=verify type="password" id="signupInputVerify" class="mb-3 form-control" placeholder="Confirm Password" required>
                    <button class="btn btn-lg btn-primary btn-block" type="submit">Go</button>
                  </form>
                </div>
              </div>
            </div>
            <div class="col-12 col-md-6 col-lg-4 col-xl-3 d-flex">
              <div class="card mb-4 shadow-sm flex-fill">
                <div class="card-header">
                  <h4 class="my-0 font-weight-normal">Login</h4>
                </div>
                <div class="card-body d-flex">
                  <form class='d-flex flex-grow-1 flex-column' method=POST action='/user/login' enctype='multipart/form-data'>
                    <label for="loginInputUsername" class="sr-only">Email address</label>
                    <input name=username type="text" id="loginInputUsername" class="mb-3 form-control" placeholder="Username" required>
                    <label for="loginInputPassword" class="sr-only">Password</label>
                    <input name=password type="password" id="loginInputPassword" class="mb-3 form-control" placeholder="Password" required>
                    <button class="mt-auto btn btn-lg btn-primary btn-block" type="submit">Go</button>
                  </form>
                </div>
              </div>
            </div>
          </div>
        </div>
      {{ end }}
    </article>
    {{ template "html/_footer.html" }}
  </main>
  {{ template "html/_scripts.html" }}
  {{ if .User }}
    <script>{{ template "js/main.js" $ }}</script>
  {{ end }}
</body>
</html>
")

	tmpls["html/redirect.html"] = tostring("PCFET0NUWVBFIGh0bWw+CjxodG1sIGxhbmc9ZW4+CjxoZWFkPgogIHt7IHRlbXBsYXRlICJodG1sL19oZWFkLmh0bWwiIH19CiAgPHRpdGxlPkNNUzwvdGl0bGU+CjwvaGVhZD4KPGJvZHkgY2xhc3M9J2luZGV4IGJnLWxpZ2h0Jz4KICA8c3R5bGU+e3sgdGVtcGxhdGUgImNzcy9tYWluLmNzcyIgfX08L3N0eWxlPgogIDxtYWluPgogICAge3sgdGVtcGxhdGUgImh0bWwvX2hlYWRlci5odG1sIiAkIH19CiAgICA8ZGl2IGNsYXNzPSJwcmljaW5nLWhlYWRlciBweC0zIHB5LTMgcHQtbWQtNSBwYi1tZC00IG14LWF1dG8gdGV4dC1jZW50ZXIiPgogICAgICA8aDEgY2xhc3M9ImRpc3BsYXktNCI+UmVkaXJlY3RpbmcgdG8gaHR0cHM6Ly9jbXMuZXZhbmpvbi5lc3t7LlVSTH19PC9oMT4KICAgIDwvZGl2PgogICAge3sgdGVtcGxhdGUgImh0bWwvX2Zvb3Rlci5odG1sIiB9fQogIDwvbWFpbj4KICB7eyB0ZW1wbGF0ZSAiaHRtbC9fc2NyaXB0cy5odG1sIiB9fQogIDxzY3JpcHQ+KGZ1bmN0aW9uKCl7c2V0VGltZW91dChmdW5jdGlvbigpe2xvY2F0aW9uLmhyZWY9Int7LlVSTH19Ijt9LDc1MCk7fSkoKTs8L3NjcmlwdD4KPC9ib2R5Pgo8L2h0bWw+Cg==")
	tmpls["html/redirect.html"] = tostring("PCFET0NUWVBFIGh0bWw+CjxodG1sIGxhbmc9ZW4+CjxoZWFkPgogIHt7IHRlbXBsYXRlICJodG1sL19oZWFkLmh0bWwiIH19CiAgPHRpdGxlPkNNUzwvdGl0bGU+CjwvaGVhZD4KPGJvZHkgY2xhc3M9J2luZGV4IGJnLWxpZ2h0Jz4KICA8c3R5bGU+e3sgdGVtcGxhdGUgImNzcy9tYWluLmNzcyIgfX08L3N0eWxlPgogIDxtYWluPgogICAge3sgdGVtcGxhdGUgImh0bWwvX2hlYWRlci5odG1sIiAkIH19CiAgICA8ZGl2IGNsYXNzPSJwcmljaW5nLWhlYWRlciBweC0zIHB5LTMgcHQtbWQtNSBwYi1tZC00IG14LWF1dG8gdGV4dC1jZW50ZXIiPgogICAgICA8aDEgY2xhc3M9ImRpc3BsYXktNCI+UmVkaXJlY3RpbmcgdG8gaHR0cHM6Ly9jbXMuZXZhbmpvbi5lc3t7LlVSTH19PC9oMT4KICAgIDwvZGl2PgogICAge3sgdGVtcGxhdGUgImh0bWwvX2Zvb3Rlci5odG1sIiB9fQogIDwvbWFpbj4KICB7eyB0ZW1wbGF0ZSAiaHRtbC9fc2NyaXB0cy5odG1sIiB9fQogIDxzY3JpcHQ+KGZ1bmN0aW9uKCl7c2V0VGltZW91dChmdW5jdGlvbigpe2xvY2F0aW9uLmhyZWY9Int7LlVSTH19Ijt9LDI1MCk7fSkoKTs8L3NjcmlwdD4KPC9ib2R5Pgo8L2h0bWw+Cg==")

	tmpls["html/space.html"] = tostring("<!DOCTYPE html>
<html lang=en>
<head>
  {{ template "html/_head.html" }}
  <title>CMS | {{ .Space.Name }}</title>
</head>
<body class='space bg-light'>
  <style>{{ template "css/main.css" }}</style>
  <main>
    {{ template "html/_header.html" $ }}
    <div class="pricing-header px-3 py-3 pt-md-5 pb-md-4 mx-auto text-center">
      <h1 class="display-4">{{.Space.Name}}</h1>
      <p class="lead">{{.Space.Desc}}</p>
    </div>
    <article>
      <form method=POST action='/contenttype' enctype='multipart/form-data'>
        <input type=hidden name=method value=POST />
        <input required type=hidden name=space value="{{ .Space.ID }}" />
        <div class="modal fade" id="create-contenttype" tabindex="-1" role="dialog" aria-labelledby="Create a new content type modal." aria-hidden="true">
          <div class="modal-dialog modal-dialog-scrollable">
            <div class="modal-content">
              <div class="modal-header">
                <h5 class="modal-title" id="contenttypeModalLabel">Create a new content type</h5>
                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                  <span aria-hidden="true">&times;</span>
                </button>
              </div>
              <div class="modal-body">
                <label for="contenttypeName">Name</label>
                <input name=name type=text id="contenttypeName" class="mb-3 form-control" placeholder="Name" required>
                <div id='first-fieldset' class='container-fluid px-0 mb-3'>
                  <label for="fieldsetFirst">Fields</label>
                  <input id="fieldsetFirst" class="mb-3 form-control" readonly="readonly" required type=text name="field_name_1" value="name" />
                  <div class='form-group row'>
                    <div class='col-6'>
                      <select class="w-100 form-control" readonly="readonly" required name="field_type_1">
                        <option disabled value>Field Type</option>
                        <option selected value="StringSmall">String Small</option>
                        <option disabled value="StringBig">String Big</option>
                        <option disabled value="InputHTML">HTML</option>
                        <option disabled value="InputMarkdown">Markdown</option>
                        <option disabled value="File">File</option>
                        <option disabled value="Date">Date</option>
                        <option disabled value="Reference">Reference</option>
                        <option disabled value="ReferenceList">ReferenceList</option>
                      </select>
                    </div>
                    <div class='col-6'>
                      <button class='w-100 btn btn-primary' disabled type=button>Remove Field</button>
                    </div>
                  </div>
                </div>
                <a href='#' class='btn btn-link' id='add-fieldbtn'>Add Another Field</a>
              </div>
              <div class="modal-footer">
                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
                <button type="submit" class="btn btn-primary">Go</button>
              </div>
            </div>
          </div>
        </div>
      </form>

      <form method=POST action='/hook' enctype='multipart/form-data'>
        <input type=hidden name=method value=POST />
        <input required type=hidden name=space value="{{ .Space.ID }}" />
        <div class="modal fade" id="hookModal" tabindex="-1" role="dialog" aria-labelledby="hookModalLabel" aria-hidden="true">
          <div class="modal-dialog modal-dialog-scrollable">
            <div class="modal-content">
              <div class="modal-header">
                <h5 class="modal-title" id="hookModalLabel">Create a new hook</h5>
                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                  <span aria-hidden="true">&times;</span>
                </button>
              </div>
              <div class="modal-body">
                <label for="hookURL">URL</label>
                <input name=url type=url id="hookURL" class="mb-3 form-control" placeholder="Must enter full URL of target" required>
              </div>
              <div class="modal-footer">
                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
                <button type="submit" class="btn btn-primary">Go</button>
              </div>
            </div>
          </div>
        </div>
      </form>

      <form method=POST action='/space' enctype='multipart/form-data'>
        <input type=hidden name=method value=PUT />
        <input required type=hidden name=space value="{{ .Space.ID }}" />
        <div class="modal fade" id="copyModal" tabindex="-1" role="dialog" aria-labelledby="copyModalLabel" aria-hidden="true">
          <div class="modal-dialog modal-dialog-scrollable">
            <div class="modal-content">
              <div class="modal-header">
                <h5 class="modal-title" id="copyModalLabel">Copy {{.Space.Name}}</h5>
                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                  <span aria-hidden="true">&times;</span>
                </button>
              </div>
              <div class="modal-body">
                <label for="spaceName">Name</label>
                <input name=name type=text id="spaceName" class="mb-3 form-control" placeholder="Name" required>
                <label for="spaceDesc">Description</label>
                <input name=desc type=text id="spaceDesc" class="mb-3 form-control" placeholder="Description" required>
              </div>
              <div class="modal-footer">
                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
                <button type="submit" class="btn btn-primary">Go</button>
              </div>
            </div>
          </div>
        </div>
      </form>

      <form method=POST action='/space' enctype='multipart/form-data'>
        <input type=hidden name=method value=PATCH />
        <input required type=hidden name=space value="{{ .Space.ID }}" />
        <div class="modal fade" id="updateModal" tabindex="-1" role="dialog" aria-labelledby="updateModalLabel" aria-hidden="true">
          <div class="modal-dialog modal-dialog-scrollable">
            <div class="modal-content">
              <div class="modal-header">
                <h5 class="modal-title" id="updateModalLabel">Update {{.Space.Name}}</h5>
                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                  <span aria-hidden="true">&times;</span>
                </button>
              </div>
              <div class="modal-body">
                <label for="spaceName">Name</label>
                <input value="{{ .Space.Name }}" name=name type=text id="spaceName" class="mb-3 form-control" placeholder="Name" required>
                <label for="spaceDesc">Description</label>
                <input value="{{ .Space.Desc }}" name=desc type=text id="spaceDesc" class="mb-3 form-control" placeholder="Description" required>
              </div>
              <div class="modal-footer">
                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
                <button type="submit" class="btn btn-primary">Go</button>
              </div>
            </div>
          </div>
        </div>
      </form>
      
      <form method=POST action='/space' enctype='multipart/form-data'>
        <input type=hidden name=method value=DELETE />
        <input required type=hidden name=space value="{{ .Space.ID }}" />
        <div class="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="deleteModalLabel" aria-hidden="true">
          <div class="modal-dialog modal-dialog-scrollable">
            <div class="modal-content">
              <div class="modal-header">
                <h5 class="modal-title" id="deleteModalLabel">Delete {{.Space.Name}}</h5>
                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                  <span aria-hidden="true">&times;</span>
                </button>
              </div>
              <div class="modal-footer">
                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
                <button type="submit" class="btn btn-primary">Go</button>
              </div>
            </div>
          </div>
        </div>
      </form>

      <div class="container">
        <div class='row'>
          <div class='col-lg-6'>
            <div class="my-3 p-3 bg-white rounded shadow-sm">
                <small class="d-block text-right float-right" data-toggle="modal" data-target="#create-contenttype">
                  <a href="#">Create a new content type</a>
                </small>
              <h6 class="border-bottom border-gray pb-2 mb-0">Your content types</h6>
              {{ if .ContentTypes.List }}
                {{ range .ContentTypes.List }}
                <div class="media text-muted pt-3">
                  <a href='/contenttype/{{ $.Space.ID }}/{{ .ID }}'  class="d-block media-body pb-3 mb-0 small lh-125 border-bottom border-gray">
                    <strong class="d-block text-gray-dark">{{ .Name }}</strong>
                  </a>
                </div>
                {{ end }}
                {{ if .ContentTypes.More }}
                <small class="d-block text-right mt-3">
                  <a href="/space/{{ .Space.ID }}?beforect={{ .ContentTypes.Before }}">Load more</a>
                </small>
                {{ end }}
              {{ else }}
                <div class="mt-3 alert alert-primary" role="alert">
                  You haven't created any content types yet. 
                </div>
              {{ end }}
            </div>
          </div>
          <div class='col-lg-6'>
            <div class="my-3 p-3 bg-white rounded shadow-sm">
                <small class="d-block text-right float-right" data-toggle="modal" data-target="#hookModal">
                  <a href="#">Create a new webhook</a>
                </small>
              <h6 class="border-bottom border-gray pb-2 mb-0">Your webhooks</h6>
              {{ if .Hooks.List }}
                {{ range .Hooks.List }}
                <div class="media text-muted pt-3">
                  <a href='/hook/{{ $.Space.ID }}/{{ .ID }}'  class="d-block media-body pb-3 mb-0 small lh-125 border-bottom border-gray">
                    <strong class="d-block text-gray-dark">{{ .URL }}</strong>
                  </a>
                </div>
                {{ end }}
                {{ if .Hooks.More }}
                <small class="d-block text-right mt-3">
                  <a href="/space/{{ .Space.ID }}?beforehook={{ .Hooks.Before }}">Load more</a>
                </small>
                {{ end }}
              {{ else }}
                <div class="mt-3 alert alert-primary" role="alert">
                  You haven't created any webhooks yet. 
                </div>
              {{ end }}
            </div>
          </div>
        </div>
      </div>

    </article>
    {{ template "html/_footer.html" }}
  </main>
  {{ template "html/_scripts.html" }}
  <script>{{ template "js/main.js" $ }}</script>
  <script>{{ template "js/space.js" $ }}</script>
</body>

</html>
")


M pkg/e3/e3.go => pkg/e3/e3.go +7 -7
@@ 18,8 18,8 @@ type E3 struct {

const DefaultURL = "https://e3.evanjon.es/api"

func New(user, pass, url string) *E3 {
	return &E3{
func New(user, pass, url string) E3 {
	return E3{
		user,
		pass,
		url,


@@ 27,8 27,8 @@ func New(user, pass, url string) *E3 {
	}
}

func WithClient(user, pass, url string, client *http.Client) *E3 {
	return &E3{
func WithClient(user, pass, url string, client *http.Client) E3 {
	return E3{
		user,
		pass,
		url,


@@ 36,11 36,11 @@ func WithClient(user, pass, url string, client *http.Client) *E3 {
	}
}

func (e3 *E3) URL() string {
func (e3 E3) URL() string {
	return e3.url
}

func (e3 *E3) Upload(ctx context.Context, public bool, filename string, file io.Reader) (string, error) {
func (e3 E3) Upload(ctx context.Context, public bool, filename string, file io.Reader) (string, error) {
	var requestBody bytes.Buffer
	mpwriter := multipart.NewWriter(&requestBody)



@@ 94,7 94,7 @@ func (e3 *E3) Upload(ctx context.Context, public bool, filename string, file io.
	return res, nil
}

func (e3 *E3) Proxy(ctx context.Context, objectURL string) ([]byte, error) {
func (e3 E3) Proxy(ctx context.Context, objectURL string) ([]byte, error) {
	req, err := http.NewRequestWithContext(ctx, "GET", objectURL, nil)
	if err != nil {
		return []byte{}, err