Compare commits

..

No commits in common. "main" and "v0.3.0" have entirely different histories.
main ... v0.3.0

22 changed files with 566 additions and 715 deletions

View file

@ -18,5 +18,4 @@ repos:
name: ui/menu lint+fmt
language: system
files: ^ui/menu/
pass_filenames: false
entry: npm run --prefix ui/menu pc
entry: sh -c "npm run --prefix ui/menu pc"

View file

@ -2,41 +2,6 @@
All notable changes to this project will be documented in this file.
## [0.4.2] - 2023-07-22
### Bug Fixes
- Container entrypoint
- Website version ordering
### Miscellaneous Tasks
- Fix npm pre-commit hook
## [0.4.1] - 2023-04-05
### Bug Fixes
- Stop propagation of key events on menu search
- Use sh
- Remove version prefix from "latest" tag
- Detect CI commit SHA
- Use better abbreviations for page names
### Features
- Add upload script
## [0.4.0] - 2023-04-02
### Features
- [**breaking**] Switch database format to CBOR (not compatible with previous format)
### Miscellaneous Tasks
- Hide version-bump messages
## [0.3.0] - 2023-04-02
### Bug Fixes

1006
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
[package]
name = "talon"
version = "0.4.2"
version = "0.3.0"
edition = "2021"
authors = ["ThetaDev <t.testboy@gmail.com>"]
license = "MIT"
@ -16,7 +16,7 @@ tokio = { version = "1.25.0", features = ["rt-multi-thread", "fs", "signal"] }
sled = "0.34.7"
serde = "1.0.152"
serde_json = "1.0.93"
serde_cbor = "0.11.2"
rmp-serde = "1.1.1"
toml = "0.7.2"
thiserror = "1.0.38"
time = { version = "0.3.15", features = [

View file

@ -48,7 +48,7 @@ commit_parsers = [
{ message = "^refactor", group = "Refactor"},
{ message = "^style", group = "Styling"},
{ message = "^test", group = "Testing"},
{ message = "^chore\\(release\\):", skip = true},
{ message = "^chore\\(release\\): prepare for", skip = true},
{ message = "(^chore)|(^ci)", group = "Miscellaneous Tasks"},
{ body = ".*security", group = "Security"},
]

View file

@ -41,8 +41,7 @@ for arch in "${ARCHITECTURES[@]}"; do
# Finalize container
buildah umount "$container"
# entrypoint syntax: see issue https://github.com/containers/buildah/issues/1768
buildah config --entrypoint '["/talon"]' --cmd "run -d /data" --arch "$arch" --port 3000 --author "ThetaDev" "$container"
buildah config --entrypoint "/talon" --cmd "run -d /data" --arch "$arch" --port 3000 --author "ThetaDev" "$container"
buildah commit "$container" "$IMAGE:$arch-$TAG"
buildah manifest add "$REGISTRY/$IMAGE:$TAG" "$IMAGE:$arch-$TAG"

View file

@ -1,75 +0,0 @@
#!/bin/sh
set -e
# Check for dependencies
which curl > /dev/null
which jq > /dev/null
# Assert required variables
if [ -z "$TALON_KEY" ]; then echo "TALON_KEY unset"; exit 1; fi
if [ -z "$TALON_URL" ]; then echo "TALON_URL unset"; exit 1; fi
if [ -z "$SUBDOMAIN" ]; then echo "SUBDOMAIN unset"; exit 1; fi
API_URL="$TALON_URL/api"
API_KEY_H="x-api-key: $TALON_KEY"
# Check if the website already exists
WEBSITE_STATUS=$(curl --head -o /dev/null -s -w "%{http_code}" "$API_URL/website/$SUBDOMAIN")
if [ "$WEBSITE_STATUS" = "200" ]; then
echo "Website '$SUBDOMAIN' found"
else
# Create the website if it does not exist
if [ -z "$WEBSITE_NAME" ]; then echo "WEBSITE_NAME unset"; exit 1; fi
CREATE_BODY=$(jq -c --null-input --arg name "$WEBSITE_NAME" --arg color "$WEBSITE_COLOR" \
--arg visibility "$WEBSITE_VISIBILITY" --arg source_url "$WEBSITE_SOURCE_URL" \
--arg source_icon "$WEBSITE_SOURCE_ICON" \
'{"name": $name, "color": $color, "visibility": $visibility, "source_url": $source_url, "source_icon": $source_icon} | delpaths([path(.[]| select(.==""))])')
echo "Creating website '$SUBDOMAIN': $CREATE_BODY"
curl -Ss --fail -X "PUT" -H "$API_KEY_H" -H "content-type: application/json" --data "$CREATE_BODY" "$API_URL/website/$SUBDOMAIN"
fi
# Check the upload directory
if [ ! -d "$1" ]; then echo "Upload directory does not exist"; exit 1; fi
if [ ! -f "$1/index.html" ]; then echo "Upload directory does not contain index.html"; exit 1; fi
# Validate fallback page param
if [ "$FALLBACK" ] && [ ! -f "$1/$FALLBACK" ]; then echo "fallback page $FALLBACK does not exist"; exit 1; fi
# Automatically detect fallback pages
if [ -z "$SPA" ] && [ -z "$FALLBACK" ]; then
if [ -f "$1/404.html" ]; then FALLBACK="404.html"; fi
if [ -f "$1/200.html" ]; then SPA=true; FALLBACK="200.html"; fi
fi
push_arg() {
if [ "$UPLOAD_ARGS" ]; then UPLOAD_ARGS="$UPLOAD_ARGS&"; fi
UPLOAD_ARGS="$UPLOAD_ARGS$1"
}
if [ "$FALLBACK" ]; then push_arg "fallback=$FALLBACK"; fi
if [ "$SPA" = "true" ]; then push_arg "spa=true"; fi
if [ "$UPLOAD_ARGS" ]; then UPLOAD_ARGS="?$UPLOAD_ARGS"; fi
if [ "$CI_COMMIT_SHA" ]; then
echo "Git commit: $CI_COMMIT_SHA"
push_arg "commit=$CI_COMMIT_SHA"
elif GIT_COMMIT=$(git rev-parse HEAD 2> /dev/null); then
echo "Git commit: $GIT_COMMIT"
push_arg "commit=$GIT_COMMIT"
fi
# Compress website
ARCHIVE=$(mktemp)
tar -cz --directory "$1" --file "$ARCHIVE" .
# Upload website
echo "Version params: $UPLOAD_ARGS"
echo "Uploading..."
curl --fail -X "POST" -H "$API_KEY_H" -H "content-type: application/octet-stream" --data-binary "@$ARCHIVE" "$API_URL/website/$SUBDOMAIN/upload$UPLOAD_ARGS"
rm "$ARCHIVE"
echo "Website uploaded ;-)"

View file

@ -107,7 +107,7 @@ impl TalonApi {
.db
.get_website(&subdomain)
.map(|website| {
let modified = website.updated_at;
let modified = website.updated_at();
Response::new(Json(Website::from((subdomain.0, website)))).header(
header::LAST_MODIFIED,
httpdate::fmt_http_date(modified.into()),
@ -300,17 +300,18 @@ impl TalonApi {
subdomain: Path<String>,
) -> Result<Response<Json<Vec<Version>>>> {
let website = talon.db.get_website(&subdomain)?;
let mut versions = talon
talon
.db
.get_website_versions(&subdomain)
.map(|r| r.map(Version::from))
.collect::<Result<Vec<_>, _>>()?;
versions.sort_by_key(|v| v.id);
Ok(Response::new(Json(versions)).header(
header::LAST_MODIFIED,
httpdate::fmt_http_date(website.updated_at.into()),
))
.collect::<Result<Vec<_>, _>>()
.map(|data| {
Response::new(Json(data)).header(
header::LAST_MODIFIED,
httpdate::fmt_http_date(website.updated_at().into()),
)
})
.map_err(Error::from)
}
/// Get version

View file

@ -30,8 +30,10 @@ struct DbInner {
pub enum DbError {
#[error("sled db error: {0}")]
Sled(#[from] sled::Error),
#[error("cbor serialization error: {0}")]
Serialize(#[from] serde_cbor::Error),
#[error("msgpack serialization error: {0}")]
Serialize(#[from] rmp_serde::encode::Error),
#[error("msgpack deserialization error: {0}")]
Deserialize(#[from] rmp_serde::decode::Error),
#[error("json serialization error: {0}")]
Json(#[from] serde_json::Error),
#[error("{0} with id `{1}` already exists")]
@ -98,7 +100,7 @@ impl Db {
for item in self.i.websites.iter() {
let (k, v) = item?;
let key = Self::key_to_string(k.to_vec())?;
let value = serde_cbor::from_slice::<Website>(&v)?;
let value = rmp_serde::from_slice::<Website>(&v)?;
let dataset = ExportDataset::Website { key, value };
@ -109,7 +111,7 @@ impl Db {
for item in self.i.versions.iter() {
let (k, v) = item?;
let key = Self::key_to_string(k.to_vec())?;
let value = serde_cbor::from_slice::<Version>(&v)?;
let value = rmp_serde::from_slice::<Version>(&v)?;
let dataset = ExportDataset::Version { key, value };
serde_json::to_writer(&mut writer, &dataset)?;
@ -150,11 +152,11 @@ impl Db {
fn import_dataset(&self, ds: ExportDataset) -> Result<()> {
match ds {
ExportDataset::Website { key, value } => {
let data = serde_cbor::to_vec(&value)?;
let data = rmp_serde::to_vec(&value)?;
self.i.websites.insert(key, data)?;
}
ExportDataset::Version { key, value } => {
let data = serde_cbor::to_vec(&value)?;
let data = rmp_serde::to_vec(&value)?;
self.i.versions.insert(key, data)?;
}
ExportDataset::File { key, value } => {
@ -176,13 +178,13 @@ impl Db {
/// Get a website from the database
pub fn get_website(&self, subdomain: &str) -> Result<Website> {
let data = self.i.websites.get(subdomain)?;
data.and_then(|data| serde_cbor::from_slice::<Website>(data.as_ref()).ok())
data.and_then(|data| rmp_serde::from_slice::<Website>(data.as_ref()).ok())
.ok_or_else(|| DbError::NotExists("website", subdomain.to_owned()))
}
/// Insert a new website into the database
pub fn insert_website(&self, subdomain: &str, website: &Website) -> Result<()> {
let data = serde_cbor::to_vec(website)?;
let data = rmp_serde::to_vec(website)?;
self.i
.websites
.compare_and_swap(subdomain, None::<&[u8]>, Some(data))?
@ -196,7 +198,7 @@ impl Db {
.i
.websites
.update_and_fetch(subdomain, |data| match data {
Some(data) => match serde_cbor::from_slice::<Website>(data) {
Some(data) => match rmp_serde::from_slice::<Website>(data) {
Ok(mut w) => {
let website = website.clone();
w.name = website.name.unwrap_or(w.name);
@ -206,9 +208,9 @@ impl Db {
w.source_url = website.source_url.unwrap_or(w.source_url);
w.source_icon = website.source_icon.unwrap_or(w.source_icon);
w.has_icon = website.has_icon.unwrap_or(w.has_icon);
w.updated_at = OffsetDateTime::now_utc();
w.updated_at = Some(OffsetDateTime::now_utc());
serde_cbor::to_vec(&w).ok()
rmp_serde::to_vec(&w).ok()
}
Err(_) => None,
},
@ -250,7 +252,7 @@ impl Db {
self.i.websites.iter().map(|r| {
r.map_err(DbError::from).and_then(|(k, v)| {
let subdomain = Self::key_to_string(k.to_vec())?;
let website = serde_cbor::from_slice::<Website>(&v)?;
let website = rmp_serde::from_slice::<Website>(&v)?;
Ok((subdomain, website))
})
})
@ -299,7 +301,7 @@ impl Db {
let key = Self::version_key(subdomain, id);
let data = self.i.versions.get(&key)?;
data.and_then(|data| serde_cbor::from_slice::<Version>(data.as_ref()).ok())
data.and_then(|data| rmp_serde::from_slice::<Version>(data.as_ref()).ok())
.ok_or_else(|| DbError::NotExists("version", key))
}
@ -311,16 +313,16 @@ impl Db {
.i
.websites
.update_and_fetch(subdomain, |data| match data {
Some(data) => match serde_cbor::from_slice::<Website>(data) {
Some(data) => match rmp_serde::from_slice::<Website>(data) {
Ok(mut w) => {
w.vid_count += 1;
serde_cbor::to_vec(&w).ok()
rmp_serde::to_vec(&w).ok()
}
Err(_) => None,
},
None => None,
})?
.and_then(|data| serde_cbor::from_slice::<Website>(&data).ok());
.and_then(|data| rmp_serde::from_slice::<Website>(&data).ok());
let id = match ws {
Some(ws) => ws.vid_count,
@ -328,7 +330,7 @@ impl Db {
};
let key = Self::version_key(subdomain, id);
let data = serde_cbor::to_vec(version)?;
let data = rmp_serde::to_vec(version)?;
self.i
.versions
.compare_and_swap(&key, None::<&[u8]>, Some(data))?
@ -343,12 +345,12 @@ impl Db {
self.i
.websites
.update_and_fetch(subdomain, |data| match data {
Some(data) => match serde_cbor::from_slice::<Website>(data) {
Some(data) => match rmp_serde::from_slice::<Website>(data) {
Ok(mut w) => {
if w.vid_count == version {
w.vid_count -= 1;
}
serde_cbor::to_vec(&w).ok()
rmp_serde::to_vec(&w).ok()
}
Err(_) => None,
},
@ -416,7 +418,7 @@ impl Db {
self.i.versions.scan_prefix(key).map(|r| {
r.map_err(DbError::from).and_then(|(k, v)| {
let (_, id) = Self::split_version_key(k.to_vec())?;
let version = serde_cbor::from_slice::<Version>(&v)?;
let version = rmp_serde::from_slice::<Version>(&v)?;
Ok((id, version))
})
})

View file

@ -12,8 +12,6 @@ pub struct Website {
pub name: String,
/// Website creation date
pub created_at: OffsetDateTime,
/// Website update date
pub updated_at: OffsetDateTime,
/// Latest version ID
pub latest_version: Option<u32>,
/// Color of the page icon
@ -29,7 +27,11 @@ pub struct Website {
/// value + 1 will be the next version ID
pub vid_count: u32,
/// Does the website have an icon?
#[serde(default)]
pub has_icon: bool,
/// Website update date
#[serde(default)]
pub updated_at: Option<OffsetDateTime>,
}
impl Default for Website {
@ -39,7 +41,7 @@ impl Default for Website {
Self {
name: Default::default(),
created_at,
updated_at: created_at,
updated_at: Some(created_at),
latest_version: Default::default(),
color: Default::default(),
visibility: Default::default(),
@ -51,6 +53,12 @@ impl Default for Website {
}
}
impl Website {
pub fn updated_at(&self) -> OffsetDateTime {
self.updated_at.unwrap_or(self.created_at)
}
}
/// Update a website in the database with the contained values
///
/// Values set to `None` remain unchanged.

View file

@ -75,7 +75,7 @@ fn insert_websites(db: &Db) {
&Website {
name: "ThetaDev".to_owned(),
created_at: datetime!(2023-02-18 16:30 +0),
updated_at: datetime!(2023-02-18 16:30 +0),
updated_at: Some(datetime!(2023-02-18 16:30 +0)),
latest_version: Some(2),
color: Some(2068974),
visibility: talon::model::Visibility::Featured,
@ -88,7 +88,7 @@ fn insert_websites(db: &Db) {
&Website {
name: "Spotify-Gender-Ex".to_owned(),
created_at: datetime!(2023-02-18 16:30 +0),
updated_at: datetime!(2023-02-18 16:30 +0),
updated_at: Some(datetime!(2023-02-18 16:30 +0)),
latest_version: Some(1),
color: Some(1947988),
visibility: talon::model::Visibility::Featured,
@ -103,7 +103,7 @@ fn insert_websites(db: &Db) {
&Website {
name: "RustyPipe".to_owned(),
created_at: datetime!(2023-02-20 18:30 +0),
updated_at: datetime!(2023-02-20 18:30 +0),
updated_at: Some(datetime!(2023-02-20 18:30 +0)),
latest_version: Some(1),
color: Some(7943647),
visibility: talon::model::Visibility::Featured,
@ -118,7 +118,7 @@ fn insert_websites(db: &Db) {
&Website {
name: "SvelteKit SPA".to_owned(),
created_at: datetime!(2023-03-03 22:00 +0),
updated_at: datetime!(2023-03-03 22:00 +0),
updated_at: Some(datetime!(2023-03-03 22:00 +0)),
latest_version: Some(1),
color: Some(16727552),
visibility: talon::model::Visibility::Hidden,

View file

@ -2,9 +2,9 @@
source: tests/tests.rs
expression: data
---
{"type":"website","key":"rustypipe","value":{"name":"RustyPipe","created_at":[2023,51,18,30,0,0,0,0,0],"updated_at":[2023,51,18,30,0,0,0,0,0],"latest_version":1,"color":7943647,"visibility":"featured","source_url":"https://code.thetadev.de/ThetaDev/rustypipe","source_icon":"gitea","vid_count":1,"has_icon":false}}
{"type":"website","key":"spa","value":{"name":"SvelteKit SPA","created_at":[2023,62,22,0,0,0,0,0,0],"updated_at":[2023,62,22,0,0,0,0,0,0],"latest_version":1,"color":16727552,"visibility":"hidden","source_url":null,"source_icon":null,"vid_count":1,"has_icon":false}}
{"type":"website","key":"spotify-gender-ex","value":{"name":"Spotify-Gender-Ex","created_at":[2023,49,16,30,0,0,0,0,0],"updated_at":[2023,49,16,30,0,0,0,0,0],"latest_version":1,"color":1947988,"visibility":"featured","source_url":"https://github.com/Theta-Dev/Spotify-Gender-Ex","source_icon":"github","vid_count":1,"has_icon":false}}
{"type":"website","key":"rustypipe","value":{"name":"RustyPipe","created_at":[2023,51,18,30,0,0,0,0,0],"latest_version":1,"color":7943647,"visibility":"featured","source_url":"https://code.thetadev.de/ThetaDev/rustypipe","source_icon":"gitea","vid_count":1,"has_icon":false,"updated_at":[2023,51,18,30,0,0,0,0,0]}}
{"type":"website","key":"spa","value":{"name":"SvelteKit SPA","created_at":[2023,62,22,0,0,0,0,0,0],"latest_version":1,"color":16727552,"visibility":"hidden","source_url":null,"source_icon":null,"vid_count":1,"has_icon":false,"updated_at":[2023,62,22,0,0,0,0,0,0]}}
{"type":"website","key":"spotify-gender-ex","value":{"name":"Spotify-Gender-Ex","created_at":[2023,49,16,30,0,0,0,0,0],"latest_version":1,"color":1947988,"visibility":"featured","source_url":"https://github.com/Theta-Dev/Spotify-Gender-Ex","source_icon":"github","vid_count":1,"has_icon":false,"updated_at":[2023,49,16,30,0,0,0,0,0]}}
{"type":"version","key":"rustypipe:1","value":{"created_at":[2023,51,18,30,0,0,0,0,0],"data":{},"fallback":null,"spa":false}}
{"type":"version","key":"spa:1","value":{"created_at":[2023,62,22,0,0,0,0,0,0],"data":{},"fallback":"200.html","spa":true}}
{"type":"version","key":"spotify-gender-ex:1","value":{"created_at":[2023,49,16,30,0,0,0,0,0],"data":{},"fallback":null,"spa":false}}

View file

@ -2,10 +2,10 @@
source: tests/tests.rs
expression: data
---
{"type":"website","key":"-","value":{"name":"ThetaDev","created_at":[2023,49,16,30,0,0,0,0,0],"updated_at":[2023,49,16,30,0,0,0,0,0],"latest_version":2,"color":2068974,"visibility":"featured","source_url":null,"source_icon":null,"vid_count":2,"has_icon":false}}
{"type":"website","key":"rustypipe","value":{"name":"RustyPipe","created_at":[2023,51,18,30,0,0,0,0,0],"updated_at":[2023,51,18,30,0,0,0,0,0],"latest_version":1,"color":7943647,"visibility":"featured","source_url":"https://code.thetadev.de/ThetaDev/rustypipe","source_icon":"gitea","vid_count":1,"has_icon":false}}
{"type":"website","key":"spa","value":{"name":"SvelteKit SPA","created_at":[2023,62,22,0,0,0,0,0,0],"updated_at":[2023,62,22,0,0,0,0,0,0],"latest_version":1,"color":16727552,"visibility":"hidden","source_url":null,"source_icon":null,"vid_count":1,"has_icon":false}}
{"type":"website","key":"spotify-gender-ex","value":{"name":"Spotify-Gender-Ex","created_at":[2023,49,16,30,0,0,0,0,0],"updated_at":[2023,49,16,30,0,0,0,0,0],"latest_version":1,"color":1947988,"visibility":"featured","source_url":"https://github.com/Theta-Dev/Spotify-Gender-Ex","source_icon":"github","vid_count":1,"has_icon":false}}
{"type":"website","key":"-","value":{"name":"ThetaDev","created_at":[2023,49,16,30,0,0,0,0,0],"latest_version":2,"color":2068974,"visibility":"featured","source_url":null,"source_icon":null,"vid_count":2,"has_icon":false,"updated_at":[2023,49,16,30,0,0,0,0,0]}}
{"type":"website","key":"rustypipe","value":{"name":"RustyPipe","created_at":[2023,51,18,30,0,0,0,0,0],"latest_version":1,"color":7943647,"visibility":"featured","source_url":"https://code.thetadev.de/ThetaDev/rustypipe","source_icon":"gitea","vid_count":1,"has_icon":false,"updated_at":[2023,51,18,30,0,0,0,0,0]}}
{"type":"website","key":"spa","value":{"name":"SvelteKit SPA","created_at":[2023,62,22,0,0,0,0,0,0],"latest_version":1,"color":16727552,"visibility":"hidden","source_url":null,"source_icon":null,"vid_count":1,"has_icon":false,"updated_at":[2023,62,22,0,0,0,0,0,0]}}
{"type":"website","key":"spotify-gender-ex","value":{"name":"Spotify-Gender-Ex","created_at":[2023,49,16,30,0,0,0,0,0],"latest_version":1,"color":1947988,"visibility":"featured","source_url":"https://github.com/Theta-Dev/Spotify-Gender-Ex","source_icon":"github","vid_count":1,"has_icon":false,"updated_at":[2023,49,16,30,0,0,0,0,0]}}
{"type":"version","key":"-:1","value":{"created_at":[2023,49,16,30,0,0,0,0,0],"data":{"Deployed by":"https://github.com/Theta-Dev/Talon/actions/runs/1352014628","Version":"v0.1.0"},"fallback":null,"spa":false}}
{"type":"version","key":"-:2","value":{"created_at":[2023,49,16,52,0,0,0,0,0],"data":{"Deployed by":"https://github.com/Theta-Dev/Talon/actions/runs/1354755231","Version":"v0.1.1"},"fallback":null,"spa":false}}
{"type":"version","key":"rustypipe:1","value":{"created_at":[2023,51,18,30,0,0,0,0,0],"data":{},"fallback":null,"spa":false}}

View file

@ -6,7 +6,6 @@ expression: "vec![ws1, ws2, ws3]"
Website(
name: "ThetaDev",
created_at: (2023, 49, 16, 30, 0, 0, 0, 0, 0),
updated_at: (2023, 49, 16, 30, 0, 0, 0, 0, 0),
latest_version: Some(2),
color: Some(2068974),
visibility: featured,
@ -14,11 +13,11 @@ expression: "vec![ws1, ws2, ws3]"
source_icon: None,
vid_count: 2,
has_icon: false,
updated_at: Some((2023, 49, 16, 30, 0, 0, 0, 0, 0)),
),
Website(
name: "Spotify-Gender-Ex",
created_at: (2023, 49, 16, 30, 0, 0, 0, 0, 0),
updated_at: (2023, 49, 16, 30, 0, 0, 0, 0, 0),
latest_version: Some(1),
color: Some(1947988),
visibility: featured,
@ -26,11 +25,11 @@ expression: "vec![ws1, ws2, ws3]"
source_icon: Some(github),
vid_count: 1,
has_icon: false,
updated_at: Some((2023, 49, 16, 30, 0, 0, 0, 0, 0)),
),
Website(
name: "RustyPipe",
created_at: (2023, 51, 18, 30, 0, 0, 0, 0, 0),
updated_at: (2023, 51, 18, 30, 0, 0, 0, 0, 0),
latest_version: Some(1),
color: Some(7943647),
visibility: featured,
@ -38,5 +37,6 @@ expression: "vec![ws1, ws2, ws3]"
source_icon: Some(gitea),
vid_count: 1,
has_icon: false,
updated_at: Some((2023, 51, 18, 30, 0, 0, 0, 0, 0)),
),
]

View file

@ -6,7 +6,6 @@ expression: websites
("-", Website(
name: "ThetaDev",
created_at: (2023, 49, 16, 30, 0, 0, 0, 0, 0),
updated_at: (2023, 49, 16, 30, 0, 0, 0, 0, 0),
latest_version: Some(2),
color: Some(2068974),
visibility: featured,
@ -14,11 +13,11 @@ expression: websites
source_icon: None,
vid_count: 2,
has_icon: false,
updated_at: Some((2023, 49, 16, 30, 0, 0, 0, 0, 0)),
)),
("rustypipe", Website(
name: "RustyPipe",
created_at: (2023, 51, 18, 30, 0, 0, 0, 0, 0),
updated_at: (2023, 51, 18, 30, 0, 0, 0, 0, 0),
latest_version: Some(1),
color: Some(7943647),
visibility: featured,
@ -26,11 +25,11 @@ expression: websites
source_icon: Some(gitea),
vid_count: 1,
has_icon: false,
updated_at: Some((2023, 51, 18, 30, 0, 0, 0, 0, 0)),
)),
("spa", Website(
name: "SvelteKit SPA",
created_at: (2023, 62, 22, 0, 0, 0, 0, 0, 0),
updated_at: (2023, 62, 22, 0, 0, 0, 0, 0, 0),
latest_version: Some(1),
color: Some(16727552),
visibility: hidden,
@ -38,11 +37,11 @@ expression: websites
source_icon: None,
vid_count: 1,
has_icon: false,
updated_at: Some((2023, 62, 22, 0, 0, 0, 0, 0, 0)),
)),
("spotify-gender-ex", Website(
name: "Spotify-Gender-Ex",
created_at: (2023, 49, 16, 30, 0, 0, 0, 0, 0),
updated_at: (2023, 49, 16, 30, 0, 0, 0, 0, 0),
latest_version: Some(1),
color: Some(1947988),
visibility: featured,
@ -50,5 +49,6 @@ expression: websites
source_icon: Some(github),
vid_count: 1,
has_icon: false,
updated_at: Some((2023, 49, 16, 30, 0, 0, 0, 0, 0)),
)),
]

View file

@ -5,7 +5,6 @@ expression: website
Website(
name: "ThetaDev2",
created_at: (2023, 49, 16, 30, 0, 0, 0, 0, 0),
updated_at: "[date]",
latest_version: Some(2),
color: Some(1000),
visibility: hidden,
@ -13,4 +12,5 @@ Website(
source_icon: Some(link),
vid_count: 2,
has_icon: false,
updated_at: "[date]",
)

View file

@ -862,7 +862,6 @@ mod api {
Website(
name: "Test",
created_at: "[date]",
updated_at: "[date]",
latest_version: None,
color: Some(1000),
visibility: searchable,
@ -870,6 +869,7 @@ mod api {
source_icon: Some(git),
vid_count: 0,
has_icon: false,
updated_at: "[date]",
)
"###);
}
@ -918,7 +918,6 @@ mod api {
Website(
name: "Test",
created_at: (2023, 49, 16, 30, 0, 0, 0, 0, 0),
updated_at: "[date]",
latest_version: Some(2),
color: Some(1000),
visibility: searchable,
@ -926,6 +925,7 @@ mod api {
source_icon: Some(git),
vid_count: 2,
has_icon: false,
updated_at: "[date]",
)
"###);
}

View file

@ -49,7 +49,7 @@
closeSearch();
}
function searchKeyup(e: KeyboardEvent) {
function searchKeypress(e: KeyboardEvent) {
switch (e.key) {
case "Enter":
if (!searchText) {
@ -96,7 +96,7 @@
active={searchOpen || Boolean(searchText).valueOf()}
on:click={openSearch}
on:focusout={closeSearch}
on:keyup={searchKeyup}
on:keyup={searchKeypress}
bind:input={searchInput}
bind:text={searchText}
/>

View file

@ -26,9 +26,7 @@
bind:this={inputElm}
bind:value={text}
on:focusout
on:keypress|stopPropagation
on:keydown|stopPropagation
on:keyup|stopPropagation
on:keyup
use:selectTextOnFocus
/>
<Icon iconName="search" size={40} scale={0.6} />

View file

@ -3,7 +3,6 @@
import Icon from "./Icon.svelte";
import type { Website } from "talon-client";
import { talonConfig } from "../util/talonData";
import { getAbbreviation } from "../util/functions";
export let website: Website;
export let size = 40;
@ -16,7 +15,7 @@
? `${talonConfig.internal}/icons/${website.subdomain}`
: null}
color={website.color}
alt={getAbbreviation(website.name)}
alt={website.name.substring(0, 2)}
{size}
{scale}
/>

View file

@ -3,7 +3,6 @@
import {
formatDate,
getSubdomainAndVersion,
getWebsiteUrl,
getWebsiteVersionUrl,
isUrl,
trimCommit,
@ -76,7 +75,9 @@
Current version #{currentVersion.id}
{#if latestVersion && latestVersion !== currentVersion}
<a class="latest-tag" href={getWebsiteUrl(currentWebsite.subdomain)}
<a
class="latest-tag"
href={getWebsiteVersionUrl(currentWebsite.subdomain, latestVersion.id)}
>Latest: #{latestVersion.id}</a
>
{/if}

View file

@ -81,23 +81,3 @@ export function trimCommit(commit: string | undefined): string | undefined {
export function isMobile(): boolean {
return window.innerWidth < 768;
}
/**
* Get a 2-letter abbreviation of the website name.
*
* If the name consists of multiple words
* (separated by spaces, underscores or CamelCase), output
* the first letters of these words.
*
* Otherwise output the first letters of the name.
*/
export function getAbbreviation(name: string): string {
const split_sep = name
.replace(/([a-z])([A-Z])/g, "$1_$2")
.split(/[ ,.;_-]/)
.filter((x) => x.length > 0);
if (split_sep.length >= 2) {
return split_sep[0].charAt(0) + split_sep[1].charAt(0);
}
return name.substring(0, 2);
}