Compare commits
15 Commits
a515c9e5b7
...
86d56734cf
Author | SHA1 | Date |
---|---|---|
Aravinth Manivannan | 86d56734cf | |
Aravinth Manivannan | c62466515f | |
Aravinth Manivannan | a11e7a75ea | |
Aravinth Manivannan | c2c139575d | |
Aravinth Manivannan | efc8ce5a27 | |
Aravinth Manivannan | 0e08a294fc | |
Aravinth Manivannan | ff9864f5ad | |
Aravinth Manivannan | 8a42978379 | |
Aravinth Manivannan | 2029d3a4e1 | |
Aravinth Manivannan | c44ecdc53f | |
Aravinth Manivannan | cd185c0d95 | |
Aravinth Manivannan | 7eb622c29a | |
Aravinth Manivannan | a421a6bbb4 | |
Aravinth Manivannan | 7579bbfc86 | |
Aravinth Manivannan | cafa729234 |
|
@ -79,10 +79,10 @@ services:
|
|||
- LPFORMS_SERVER__PROXY_HAS_TLS=false
|
||||
- LPFORMS_DEBUG=false
|
||||
- LPFORMS_SERVER_URL_PREFIX=""
|
||||
- LPFORMS_SERVER_DOMAIN="forms.librepages.test"
|
||||
- LPFORMS_SERVER_DOMAIN=forms.librepages.test
|
||||
- LPFORMS_SERVER_IP=0.0.0.0
|
||||
- LPFORMS_SERVER_PROXY_HAS_TLS=false
|
||||
- LPFORMS_DASH_API_KEY="longrandomlygeneratedpassword"
|
||||
- LPFORMS_DASH_API_KEY=longrandomlygeneratedpassword
|
||||
- LPFORMS_DATABASE_POOL=2
|
||||
- PORT=6000
|
||||
- DATABASE_URL=postgres://postgres:password@forms-postgres:5432/postgres
|
||||
|
@ -95,10 +95,10 @@ services:
|
|||
- LPCONDUCTOR_DEBUG=false
|
||||
- LPCONDUCTOR_CONDUCTOR=dummy
|
||||
- LPCONDUCTOR_SERVER_URL_PREFIX=""
|
||||
- LPCONDUCTOR_SERVER_DOMAIN="librepages.test"
|
||||
- LPCONDUCTOR_SERVER_DOMAIN=librepages.test
|
||||
- LPCONDUCTOR_SERVER_IP=0.0.0.0
|
||||
- LPCONDUCTOR_SERVER_PROXY_HAS_TLS=false
|
||||
- LPCONDUCTOR_SERVER_PORT=7000
|
||||
- LPCONDUCTOR_SOURCE_CODE=https://example.org
|
||||
- LPCONDUCTOR_CREDS_TOKEN="longrandomlygeneratedpassword"
|
||||
- LPCONDUCTOR_CREDS_TOKEN=longrandomlygeneratedpassword
|
||||
- PORT=5000
|
||||
|
|
|
@ -1479,6 +1479,7 @@ dependencies = [
|
|||
"sha2",
|
||||
"sqlx",
|
||||
"tera",
|
||||
"time",
|
||||
"tokio",
|
||||
"toml",
|
||||
"tracing",
|
||||
|
|
|
@ -57,6 +57,7 @@ reqwest = { version = "0.11.13", features = ["json"] }
|
|||
sha2 = "0.10.6"
|
||||
hmac = "0.12.1"
|
||||
hex= "0.4.3"
|
||||
time = { version = "0.3.17", features = ["formatting"] }
|
||||
|
||||
[dependencies.cache-buster]
|
||||
git = "https://github.com/realaravinth/cache-buster"
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
**Auto-deploy static websites from git repositories**
|
||||
|
||||
</p>
|
||||
|
||||
[![status-badge](https://ci.batsense.net/api/badges/LibrePages/librepages/status.svg)](https://ci.batsense.net/LibrePages/librepages)
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
[Unit]
|
||||
Description=LibrePages: Easiest way to deploy websites
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
User=librepages
|
||||
ExecStart=/usr/bin/librepages serve
|
||||
Restart=on-failure
|
||||
RestartSec=1
|
||||
SuccessExitStatus=3 4
|
||||
RestartForceExitStatus=3 4
|
||||
SystemCallArchitectures=native
|
||||
MemoryDenyWriteExecute=true
|
||||
NoNewPrivileges=true
|
||||
Environment="RUST_LOG=info"
|
||||
|
||||
[Unit]
|
||||
Wants=network-online.target
|
||||
Wants=network-online.target
|
||||
Requires=postgresql.service
|
||||
After=syslog.target
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
|
@ -25,7 +25,7 @@ DUMBSERVE_USERNAME=librepages
|
|||
DUMBSERVE_PASSWORD=$4
|
||||
DUMBSERVE_HOST="https://$DUMBSERVE_USERNAME:$DUMBSERVE_PASSWORD@dl.librepages.org"
|
||||
|
||||
NAME=librebages
|
||||
NAME=librepages
|
||||
KEY=67880CA5F4BC99BF247330E2DA576B07BC323961
|
||||
|
||||
TMP_DIR=$(mktemp -d)
|
||||
|
@ -42,6 +42,9 @@ get_bin(){
|
|||
#docker cp $container_id:/usr/local/bin/pages $TARGET_DIR/
|
||||
#docker rm -v $container_id
|
||||
cp target/release/librepages $TARGET_DIR
|
||||
cp -r contrib/ $TARGET_DIR
|
||||
cp -r config/ $TARGET_DIR
|
||||
mv $TARGET_DIR/config/default.toml $TARGET_DIR/config/config.toml
|
||||
}
|
||||
|
||||
copy() {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
readonly NAME=librepages-forms
|
||||
readonly DB_NAME=librepages-forms-postgres
|
||||
readonly NAME=librepages-forms-develop
|
||||
readonly DB_NAME=librepages-forms-postgres-develop
|
||||
|
||||
docker rm -f $NAME
|
||||
docker rm -f $DB_NAME
|
||||
|
|
|
@ -27,13 +27,15 @@ pub mod routes {
|
|||
pub struct Forms {
|
||||
pub list_submissions: &'static str,
|
||||
pub delete_submission: &'static str,
|
||||
pub get_forms_for_host: &'static str,
|
||||
}
|
||||
|
||||
impl Forms {
|
||||
pub const fn new() -> Self {
|
||||
Self {
|
||||
list_submissions: "/api/v1/forms/list",
|
||||
list_submissions: "/api/v1/forms/submissions/list",
|
||||
delete_submission: "/api/v1/forms/delete/{id}",
|
||||
get_forms_for_host: "/api/v1/forms/list",
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -41,6 +43,10 @@ pub mod routes {
|
|||
format!("{}?page={}", self.list_submissions, page)
|
||||
}
|
||||
|
||||
pub fn get_forms_for_host_route(&self, host: &str) -> String {
|
||||
format!("{}?host={}", self.get_forms_for_host, host)
|
||||
}
|
||||
|
||||
pub fn get_delete(&self, id: usize, host: &str, path: &str) -> String {
|
||||
let del = self.delete_submission.replace("{id}", &id.to_string());
|
||||
format!("{}?host={}&path={}", del, host, path)
|
||||
|
@ -88,9 +94,30 @@ async fn delete_form_submission(
|
|||
Ok(HttpResponse::Ok())
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||||
pub struct Host {
|
||||
pub host: String,
|
||||
}
|
||||
|
||||
#[actix_web_codegen_const_routes::get(
|
||||
path = "crate::V1_API_ROUTES.forms.get_forms_for_host",
|
||||
wrap = "get_auth_middleware()"
|
||||
)]
|
||||
#[tracing::instrument(name = "Get forms belonging to hostname", skip(ctx, id))]
|
||||
async fn list_all_forms(
|
||||
id: Identity,
|
||||
ctx: AppCtx,
|
||||
query: web::Query<Host>,
|
||||
) -> ServiceResult<impl Responder> {
|
||||
let owner = id.identity().unwrap();
|
||||
let forms = ctx.get_all_forms_for_host(&owner, &query.host).await?;
|
||||
Ok(HttpResponse::Ok().json(forms))
|
||||
}
|
||||
|
||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||
cfg.service(list_submission);
|
||||
cfg.service(delete_form_submission);
|
||||
cfg.service(list_all_forms);
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
@ -129,6 +156,19 @@ mod tests {
|
|||
.await
|
||||
.unwrap();
|
||||
|
||||
// get all forms for host
|
||||
let list_forms_resp = test::call_service(
|
||||
&app,
|
||||
test::TestRequest::get()
|
||||
.uri(&V1_API_ROUTES.forms.get_forms_for_host_route(&page.domain))
|
||||
.cookie(cookies.clone())
|
||||
.to_request(),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(list_forms_resp.status(), StatusCode::OK);
|
||||
let forms: Vec<String> = test::read_body_json(list_forms_resp).await;
|
||||
assert_eq!(forms, vec![site_info.path.to_string()]);
|
||||
|
||||
// list subs using REST API
|
||||
let list_form_submissions = test::call_service(
|
||||
&app,
|
||||
|
|
|
@ -67,6 +67,30 @@ impl Ctx {
|
|||
.unwrap();
|
||||
Ok(res)
|
||||
}
|
||||
|
||||
/// List all forms associated with hostname
|
||||
pub async fn get_all_forms_for_host(
|
||||
&self,
|
||||
owner: &str,
|
||||
host: &str,
|
||||
) -> ServiceResult<Vec<String>> {
|
||||
let _site = self.db.get_site(owner, host).await?;
|
||||
let mut form_url = self.settings.form.url.clone();
|
||||
form_url.set_path("/api/v1/forms/host");
|
||||
form_url.set_query(Some(&format!("host={}", host)));
|
||||
|
||||
let res = self
|
||||
.client
|
||||
.get(form_url)
|
||||
.bearer_auth(&self.settings.form.api_key)
|
||||
.send()
|
||||
.await
|
||||
.unwrap()
|
||||
.json()
|
||||
.await
|
||||
.unwrap();
|
||||
Ok(res)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
@ -132,6 +156,13 @@ mod tests {
|
|||
subs[0].value,
|
||||
Some(serde_json::to_value(&site_info).unwrap())
|
||||
);
|
||||
|
||||
let forms = ctx
|
||||
.get_all_forms_for_host(NAME, &page.domain)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(vec![site_info.path.clone()], forms);
|
||||
|
||||
ctx.delete_form_submission(NAME, subs[0].id, &site_info)
|
||||
.await
|
||||
.unwrap();
|
||||
|
|
|
@ -50,7 +50,6 @@ impl ConnectionOptions {
|
|||
async fn connect(self) -> ServiceResult<Database> {
|
||||
let pool = match self {
|
||||
Self::Fresh(fresh) => {
|
||||
tracing::info!("DATABASE URL: {}", fresh.url);
|
||||
let mut connect_options =
|
||||
sqlx::postgres::PgConnectOptions::from_str(&fresh.url).unwrap();
|
||||
if fresh.disable_logging {
|
||||
|
|
|
@ -0,0 +1,109 @@
|
|||
/*
|
||||
* Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
use std::cell::RefCell;
|
||||
|
||||
use actix_identity::Identity;
|
||||
use actix_web::http::header::ContentType;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use tera::Context;
|
||||
|
||||
use super::get_auth_middleware;
|
||||
use crate::api::v1::forms::Host;
|
||||
use crate::errors::ServiceResult;
|
||||
use crate::pages::errors::*;
|
||||
use crate::settings::Settings;
|
||||
use crate::AppCtx;
|
||||
|
||||
pub use super::*;
|
||||
|
||||
pub const DASH_SITE_FORM_HOST_LIST: TemplateFile = TemplateFile::new(
|
||||
"dash_site_form_host_list",
|
||||
"pages/dash/sites/forms/host-list.html",
|
||||
);
|
||||
|
||||
pub struct List {
|
||||
ctx: RefCell<Context>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Eq, PartialEq, Debug)]
|
||||
pub struct Form {
|
||||
pub path: String,
|
||||
pub view: String,
|
||||
}
|
||||
|
||||
impl Form {
|
||||
pub fn new(path: String, host: &str) -> Self {
|
||||
let view = PAGES.dash.site.forms.get_view(0, host, &path);
|
||||
Self { path, view }
|
||||
}
|
||||
}
|
||||
|
||||
impl CtxError for List {
|
||||
fn with_error(&self, e: &ReadableError) -> String {
|
||||
self.ctx.borrow_mut().insert(ERROR_KEY, e);
|
||||
self.render()
|
||||
}
|
||||
}
|
||||
|
||||
impl List {
|
||||
pub fn new(settings: &Settings, forms: Option<&[Form]>) -> Self {
|
||||
let ctx = RefCell::new(context(settings));
|
||||
if let Some(forms) = forms {
|
||||
ctx.borrow_mut().insert(PAYLOAD_KEY, forms);
|
||||
}
|
||||
Self { ctx }
|
||||
}
|
||||
|
||||
pub fn render(&self) -> String {
|
||||
TEMPLATES
|
||||
.render(DASH_SITE_FORM_HOST_LIST.name, &self.ctx.borrow())
|
||||
.unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
async fn get_forms(ctx: &AppCtx, id: &Identity, host: &str) -> ServiceResult<Vec<Form>> {
|
||||
let owner = id.identity().unwrap();
|
||||
let mut db_forms = ctx.get_all_forms_for_host(&owner, host).await?;
|
||||
let mut forms = Vec::with_capacity(db_forms.len());
|
||||
for form in db_forms.drain(0..) {
|
||||
forms.push(Form::new(form, host));
|
||||
}
|
||||
Ok(forms)
|
||||
}
|
||||
|
||||
#[actix_web_codegen_const_routes::get(
|
||||
path = "PAGES.dash.site.forms.list_forms",
|
||||
wrap = "get_auth_middleware()"
|
||||
)]
|
||||
#[tracing::instrument(name = "List all forms belonging to host" skip(ctx, id))]
|
||||
pub async fn list_forms(
|
||||
ctx: AppCtx,
|
||||
id: Identity,
|
||||
query: web::Query<Host>,
|
||||
) -> PageResult<impl Responder, List> {
|
||||
let sites = get_forms(&ctx, &id, &query.host)
|
||||
.await
|
||||
.map_err(|e| PageError::new(List::new(&ctx.settings, None), e))?;
|
||||
let home = List::new(&ctx.settings, Some(&sites)).render();
|
||||
let html = ContentType::html();
|
||||
Ok(HttpResponse::Ok().content_type(html).body(home))
|
||||
}
|
||||
|
||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||
cfg.service(list_forms);
|
||||
}
|
|
@ -0,0 +1,42 @@
|
|||
/*
|
||||
* Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
use actix_web::*;
|
||||
|
||||
use super::get_auth_middleware;
|
||||
pub use super::{context, Footer, TemplateFile, PAGES, PAYLOAD_KEY, TEMPLATES};
|
||||
|
||||
//pub mod delete;
|
||||
pub mod list;
|
||||
pub mod view;
|
||||
|
||||
pub fn register_templates(t: &mut tera::Tera) {
|
||||
list::DASH_SITE_FORM_HOST_LIST
|
||||
.register(t)
|
||||
.expect(list::DASH_SITE_FORM_HOST_LIST.name);
|
||||
view::DASH_SITE_FORM_VIEW
|
||||
.register(t)
|
||||
.expect(view::DASH_SITE_FORM_VIEW.name);
|
||||
// delete::DASH_SITE_DELETE
|
||||
// .register(t)
|
||||
// .expect(delete::DASH_SITE_DELETE.name);
|
||||
}
|
||||
|
||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||
list::services(cfg);
|
||||
view::services(cfg);
|
||||
//delete::services(cfg);
|
||||
}
|
|
@ -0,0 +1,283 @@
|
|||
/*
|
||||
* Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
use std::cell::RefCell;
|
||||
|
||||
use actix_identity::Identity;
|
||||
use actix_web::http::header::ContentType;
|
||||
use libforms::{FormSubmissionResp, Table};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value;
|
||||
use tera::Context;
|
||||
use time::{format_description, OffsetDateTime};
|
||||
|
||||
use super::get_auth_middleware;
|
||||
|
||||
use crate::pages::errors::*;
|
||||
use crate::settings::Settings;
|
||||
use crate::AppCtx;
|
||||
|
||||
pub use super::*;
|
||||
|
||||
pub const DASH_SITE_FORM_VIEW: TemplateFile =
|
||||
TemplateFile::new("dash_site_form_view", "pages/dash/sites/forms/view.html");
|
||||
|
||||
pub struct View {
|
||||
ctx: RefCell<Context>,
|
||||
}
|
||||
|
||||
impl CtxError for View {
|
||||
fn with_error(&self, e: &ReadableError) -> String {
|
||||
self.ctx.borrow_mut().insert(ERROR_KEY, e);
|
||||
self.render()
|
||||
}
|
||||
}
|
||||
|
||||
impl View {
|
||||
pub fn new(settings: &Settings, payload: Option<TemplateForms>) -> Self {
|
||||
let ctx = RefCell::new(context(settings));
|
||||
if let Some(payload) = payload {
|
||||
ctx.borrow_mut().insert(PAYLOAD_KEY, &payload);
|
||||
}
|
||||
|
||||
Self { ctx }
|
||||
}
|
||||
|
||||
pub fn render(&self) -> String {
|
||||
TEMPLATES
|
||||
.render(DASH_SITE_FORM_VIEW.name, &self.ctx.borrow())
|
||||
.unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Deserialize, Serialize, Eq, PartialEq)]
|
||||
pub struct TemplateForms {
|
||||
pub submissions: Vec<TemplateSubmission>,
|
||||
pub next_page: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, Default, Eq, PartialEq)]
|
||||
pub struct TemplateSubmission {
|
||||
pub value: TemplateFormData,
|
||||
pub delete: String,
|
||||
pub time: String,
|
||||
pub id: usize,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, Default, Eq, PartialEq)]
|
||||
pub struct TemplateFormData {
|
||||
pub titles: Vec<String>,
|
||||
pub rows: Vec<Vec<String>>,
|
||||
}
|
||||
|
||||
impl From<Value> for TemplateFormData {
|
||||
fn from(json: Value) -> Self {
|
||||
let mut titles = Vec::default();
|
||||
let mut rows: Vec<Vec<String>> = Vec::default();
|
||||
match json {
|
||||
Value::Object(m) => {
|
||||
let mut row: Vec<String> = Vec::default();
|
||||
for (k, v) in m.iter() {
|
||||
titles.push(k.clone());
|
||||
let value = match v {
|
||||
Value::String(s) => s.clone(),
|
||||
Value::Null => "-".into(),
|
||||
Value::Bool(b) => b.to_string(),
|
||||
Value::Number(n) => n.to_string(),
|
||||
Value::Array(a) => format!("{:?}", a),
|
||||
Value::Object(_) => unimplemented!(),
|
||||
};
|
||||
row.push(value);
|
||||
}
|
||||
|
||||
rows.push(row);
|
||||
}
|
||||
_ => unimplemented!(),
|
||||
}
|
||||
|
||||
Self { titles, rows }
|
||||
}
|
||||
}
|
||||
|
||||
impl TemplateSubmission {
|
||||
fn from_form_submission_resp(f: FormSubmissionResp, host: &str, path: &str) -> Self {
|
||||
let format = format_description::parse(
|
||||
"[year]-[month]-[day] [hour]:[minute]:[second] [offset_hour \
|
||||
sign:mandatory]:[offset_minute]:[offset_second]",
|
||||
)
|
||||
.unwrap();
|
||||
let time = OffsetDateTime::from_unix_timestamp(f.time)
|
||||
.unwrap()
|
||||
.format(&format)
|
||||
.unwrap();
|
||||
Self {
|
||||
value: f.value.unwrap().into(),
|
||||
id: f.id,
|
||||
time,
|
||||
delete: PAGES.dash.site.forms.get_delete(f.id, host, path),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl TemplateForms {
|
||||
pub fn new(
|
||||
current_page: usize,
|
||||
mut form_submissions: Vec<FormSubmissionResp>,
|
||||
host: &str,
|
||||
path: &str,
|
||||
) -> Self {
|
||||
let mut submissions = Vec::with_capacity(form_submissions.len());
|
||||
for sub in form_submissions.drain(0..) {
|
||||
let sub = TemplateSubmission::from_form_submission_resp(sub, host, path);
|
||||
submissions.push(sub);
|
||||
}
|
||||
let next_page = PAGES.dash.site.forms.get_view(current_page + 1, host, path);
|
||||
Self {
|
||||
next_page,
|
||||
submissions,
|
||||
}
|
||||
}
|
||||
}
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, Default)]
|
||||
pub struct FormPage {
|
||||
page: usize,
|
||||
host: String,
|
||||
path: String,
|
||||
}
|
||||
|
||||
impl FormPage {
|
||||
pub fn to_table(self) -> (Table, usize) {
|
||||
(
|
||||
Table {
|
||||
host: self.host,
|
||||
path: self.path,
|
||||
},
|
||||
self.page,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
#[actix_web_codegen_const_routes::get(
|
||||
path = "PAGES.dash.site.forms.view",
|
||||
wrap = "get_auth_middleware()"
|
||||
)]
|
||||
#[tracing::instrument(name = "Dashboard view site form submissions webpage", skip(ctx, id))]
|
||||
pub async fn get_form_submissions(
|
||||
ctx: AppCtx,
|
||||
id: Identity,
|
||||
payload: web::Query<FormPage>,
|
||||
) -> PageResult<impl Responder, View> {
|
||||
let owner = id.identity().unwrap();
|
||||
let payload = payload.into_inner();
|
||||
let (table, page) = payload.to_table();
|
||||
let resp = ctx
|
||||
.get_all_form_submission(&owner, page, &table)
|
||||
.await
|
||||
.unwrap();
|
||||
// .map_err(|e| PageError::new(View::new(&ctx.settings, None), e))?;
|
||||
let payload = TemplateForms::new(page, resp, &table.host, &table.path);
|
||||
|
||||
let page = View::new(&ctx.settings, Some(payload));
|
||||
let body = page.render();
|
||||
let html = ContentType::html();
|
||||
Ok(HttpResponse::Ok().content_type(html).body(body))
|
||||
}
|
||||
|
||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||
cfg.service(get_form_submissions);
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use actix_web::http::StatusCode;
|
||||
use actix_web::test;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::ctx::api::v1::auth::Password;
|
||||
use crate::ctx::ArcCtx;
|
||||
use crate::errors::ServiceError;
|
||||
use crate::pages::dash::sites::add::TemplateAddSite;
|
||||
use crate::tests;
|
||||
use crate::*;
|
||||
|
||||
use super::Table;
|
||||
use super::PAGES;
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn postgres_dashboard_form_works() {
|
||||
let (_, ctx) = tests::get_ctx().await;
|
||||
dashboard_site_form_works(ctx.clone()).await;
|
||||
}
|
||||
|
||||
async fn dashboard_site_form_works(ctx: ArcCtx) {
|
||||
const NAME: &str = "testdashsiteformuser";
|
||||
const EMAIL: &str = "testdashsiteformuser@foo.com";
|
||||
const PASSWORD: &str = "longpassword";
|
||||
|
||||
let _ = ctx.delete_user(NAME, PASSWORD).await;
|
||||
let (_, signin_resp) = ctx.register_and_signin(NAME, EMAIL, PASSWORD).await;
|
||||
let cookies = get_cookie!(signin_resp);
|
||||
let app = get_app!(ctx.clone()).await;
|
||||
let page = ctx.add_test_site(NAME.into()).await;
|
||||
|
||||
let site_info = Table {
|
||||
host: page.domain.clone(),
|
||||
path: format!("/foo/{NAME}"),
|
||||
};
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct Foo {
|
||||
foo: String,
|
||||
}
|
||||
|
||||
if let Ok(subs) = ctx.get_all_form_submission(NAME, 0, &site_info).await {
|
||||
for s in subs.iter() {
|
||||
let _ = ctx.delete_form_submission(NAME, s.id, &site_info).await;
|
||||
}
|
||||
}
|
||||
let foo = Foo {
|
||||
foo: "barvalue".into(),
|
||||
};
|
||||
ctx.add_form_submission(NAME, &site_info, &serde_json::to_value(&foo).unwrap())
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
// list forms for host
|
||||
let resp = get_request!(
|
||||
&app,
|
||||
&PAGES.dash.site.forms.get_list_host(&site_info.host),
|
||||
cookies.clone()
|
||||
);
|
||||
assert_eq!(resp.status(), StatusCode::OK);
|
||||
let res = String::from_utf8(test::read_body(resp).await.to_vec()).unwrap();
|
||||
assert!(res.contains(&site_info.path));
|
||||
|
||||
// view form submission
|
||||
let resp = get_request!(
|
||||
&app,
|
||||
&PAGES
|
||||
.dash
|
||||
.site
|
||||
.forms
|
||||
.get_view(0, &site_info.host, &site_info.path),
|
||||
cookies.clone()
|
||||
);
|
||||
assert_eq!(resp.status(), StatusCode::OK);
|
||||
let res = String::from_utf8(test::read_body(resp).await.to_vec()).unwrap();
|
||||
assert!(res.contains("foo"));
|
||||
assert!(res.contains("barvalue"));
|
||||
}
|
||||
}
|
|
@ -22,6 +22,7 @@ pub use super::{context, Footer, TemplateFile, PAGES, PAYLOAD_KEY, TEMPLATES};
|
|||
|
||||
pub mod add;
|
||||
pub mod delete;
|
||||
pub mod forms;
|
||||
pub mod view;
|
||||
|
||||
pub fn register_templates(t: &mut tera::Tera) {
|
||||
|
@ -34,10 +35,12 @@ pub fn register_templates(t: &mut tera::Tera) {
|
|||
delete::DASH_SITE_DELETE
|
||||
.register(t)
|
||||
.expect(delete::DASH_SITE_DELETE.name);
|
||||
forms::register_templates(t);
|
||||
}
|
||||
|
||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||
add::services(cfg);
|
||||
view::services(cfg);
|
||||
delete::services(cfg);
|
||||
forms::services(cfg);
|
||||
}
|
||||
|
|
|
@ -73,6 +73,7 @@ impl View {
|
|||
pub struct TemplateSiteWithEvents {
|
||||
pub site: Site,
|
||||
pub view: String,
|
||||
pub forms: String,
|
||||
pub delete: String,
|
||||
pub last_update: Option<TemplateSiteEvent>,
|
||||
pub events: Vec<TemplateSiteEvent>,
|
||||
|
@ -86,10 +87,12 @@ impl TemplateSiteWithEvents {
|
|||
) -> Self {
|
||||
let view = PAGES.dash.site.get_view(site.pub_id);
|
||||
let delete = PAGES.dash.site.get_delete(site.pub_id);
|
||||
let forms = PAGES.dash.site.forms.get_list_host(&site.hostname);
|
||||
Self {
|
||||
site,
|
||||
last_update,
|
||||
view,
|
||||
forms,
|
||||
delete,
|
||||
events,
|
||||
}
|
||||
|
|
|
@ -114,6 +114,44 @@ impl ForgejoWebhook {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
/// Dashboard Site routes
|
||||
pub struct DashSiteForms {
|
||||
/// view form submission route
|
||||
pub view: &'static str,
|
||||
/// delete form submission route
|
||||
pub delete: &'static str,
|
||||
|
||||
/// list forms belonging to hostname
|
||||
pub list_forms: &'static str,
|
||||
}
|
||||
|
||||
impl DashSiteForms {
|
||||
/// create new instance of DashSiteForms route
|
||||
pub const fn new() -> DashSiteForms {
|
||||
let view = "/dash/site/forms/submission/view";
|
||||
let delete = "/dash/site/forms/submission/delete";
|
||||
let list_forms = "/dash/site/forms/list";
|
||||
DashSiteForms {
|
||||
view,
|
||||
delete,
|
||||
list_forms,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_list_host(&self, host: &str) -> String {
|
||||
format!("{}?host={}", self.list_forms, host)
|
||||
}
|
||||
|
||||
pub fn get_view(&self, page: usize, host: &str, path: &str) -> String {
|
||||
format!("{}?host={}&path={}&page={}", self.view, host, path, page)
|
||||
}
|
||||
|
||||
pub fn get_delete(&self, id: usize, host: &str, path: &str) -> String {
|
||||
format!("{}?host={}&path={}&id={}", self.view, host, path, id)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
/// Dashboard Site routes
|
||||
pub struct DashSite {
|
||||
|
@ -123,6 +161,9 @@ pub struct DashSite {
|
|||
pub view: &'static str,
|
||||
/// delete site route
|
||||
pub delete: &'static str,
|
||||
|
||||
/// forms routes
|
||||
pub forms: DashSiteForms,
|
||||
}
|
||||
|
||||
impl DashSite {
|
||||
|
@ -131,7 +172,13 @@ impl DashSite {
|
|||
let add = "/dash/site/add";
|
||||
let view = "/dash/site/view/{deployment_pub_id}";
|
||||
let delete = "/dash/site/delete/{deployment_pub_id}";
|
||||
DashSite { add, view, delete }
|
||||
let forms = DashSiteForms::new();
|
||||
DashSite {
|
||||
add,
|
||||
view,
|
||||
delete,
|
||||
forms,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_view(&self, deployment_pub_id: Uuid) -> String {
|
||||
|
|
|
@ -110,7 +110,7 @@ impl Settings {
|
|||
let mut s = Config::builder();
|
||||
|
||||
const CURRENT_DIR: &str = "./config/default.toml";
|
||||
const ETC: &str = "/etc/static-pages/config.toml";
|
||||
const ETC: &str = "/etc/liberapages/librepages/config.toml";
|
||||
|
||||
let mut read_file = false;
|
||||
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
{% extends 'base' %}{% block title %} List Forms {% endblock title %} {% block nav
|
||||
%} {% include "auth_nav" %} {% endblock nav %} {% block main %}
|
||||
|
||||
<main class="sites__main">
|
||||
<div class="sites__collection">
|
||||
{% if payload|length > 0 %}
|
||||
{% for form in payload %}
|
||||
<a href="{{ form.view }}" class="site__container">{{ form.path }}</a>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<p class="sites__banner">Form is empty</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</main>
|
||||
|
||||
{% endblock main %}
|
|
@ -0,0 +1,34 @@
|
|||
{% extends 'base' %}{% block title %} View Data {% endblock title %} {% block nav
|
||||
%} {% include "auth_nav" %} {% endblock nav %} {% block main %}
|
||||
|
||||
<main class="sites__main">
|
||||
<div class="add-site__container">
|
||||
<section>
|
||||
{% for submission in payload.submissions %}
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
{% for title in submission.value.titles %}
|
||||
<th>{{ title }}</th>
|
||||
{% endfor %}
|
||||
<th>Time</th>
|
||||
</tr>
|
||||
</thead>
|
||||
{% for row in submission.value.rows %}
|
||||
<tbody>
|
||||
<tr>
|
||||
{% for value in row %}
|
||||
<th>{{ value }}</th>
|
||||
{% endfor %}
|
||||
<th>{{ submission.time }}</th>
|
||||
</tr>
|
||||
</tbody>
|
||||
{% endfor %}
|
||||
</table>
|
||||
{% endfor %}
|
||||
</section>
|
||||
<a href="{{payload.next_page}}">Next ></a>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
{% endblock main %}
|
|
@ -28,6 +28,11 @@
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th>Forms</th>
|
||||
<td><a href="{{ payload.forms }}" >See forms</a></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th>Branch</th>
|
||||
<td>{{ payload.site.branch }}</td>
|
||||
|
|
Loading…
Reference in New Issue