Compare commits

..

No commits in common. "f820cd86bc0d5995647b573bce91eb0373712fee" and "ffc3de9bbbee1a4270c514c36ce48b8f089e167c" have entirely different histories.

9 changed files with 63 additions and 49 deletions

View file

@ -8,7 +8,7 @@ task watch, "rebuild on change":
exec ( exec (
"watchexec " & "watchexec " &
"--project-origin . -w src " & "--project-origin . -w src " &
"nim js -d:debug -d:packagesHash:master -o:site/app.js src/app.nim" "nim js -d:packagesHash:master -o:site/app.js src/app.nim"
) )
# begin Nimble config (version 2) # begin Nimble config (version 2)

View file

@ -1,6 +1,16 @@
{ {
"version": 2, "version": 2,
"packages": { "packages": {
"dotenv": {
"version": "2.0.2",
"vcsRevision": "a3c6726147276ea1447dee292fd27bb036242b78",
"url": "https://github.com/euantorano/dotenv.nim",
"downloadMethod": "git",
"dependencies": [],
"checksums": {
"sha1": "1e70fc63c286ca3da7592d61dbe501fcea35bc72"
}
},
"jsony": { "jsony": {
"version": "1.1.5", "version": "1.1.5",
"vcsRevision": "ea811bec7fa50f5abd3088ba94cda74285e93f18", "vcsRevision": "ea811bec7fa50f5abd3088ba94cda74285e93f18",
@ -11,14 +21,27 @@
"sha1": "6aeb83e7481ca8686396a568096054bc668294df" "sha1": "6aeb83e7481ca8686396a568096054bc668294df"
} }
}, },
"karax": { "ws": {
"version": "1.3.3", "version": "0.5.0",
"vcsRevision": "b125b6f23e56e9d88068758aa56635a721782009", "vcsRevision": "9536bf99ddf5948db221ccb7bb3663aa238a8e21",
"url": "https://github.com/daylinmorgan/karax", "url": "https://github.com/treeform/ws",
"downloadMethod": "git", "downloadMethod": "git",
"dependencies": [], "dependencies": [],
"checksums": { "checksums": {
"sha1": "4c2cd8c8c6642919a81be12d7535323e7073f47e" "sha1": "ae4daf4ae302d0431f3c2d385ae9d2fe767a3246"
}
},
"karax": {
"version": "1.3.3",
"vcsRevision": "d86349c63d8ece330d749eb037a9fa5ffca87c79",
"url": "https://github.com/karaxnim/karax/",
"downloadMethod": "git",
"dependencies": [
"ws",
"dotenv"
],
"checksums": {
"sha1": "6683189b4456437c2809be72e3404adde77f5c34"
} }
} }
}, },

View file

@ -1,5 +1,7 @@
# Dependencies # Dependencies
requires "nim >= 2.0.0" requires "nim >= 2.0.0"
requires "https://github.com/daylinmorgan/karax#no-karun" requires "karax"
requires "jsony" requires "jsony"

View file

@ -5,7 +5,7 @@ import pages/pages
import context, utils import context, utils
proc render(data: RouterData): VNode = proc render(data: RouterData): VNode =
when defined(debug): console.log ctx console.log ctx
var uri = currentUri() var uri = currentUri()
result = buildHtml(tdiv( result = buildHtml(tdiv(
class = "lg:w-3/4 max-w-[90%] mx-auto md:text-lg text-sm min-h-screen flex flex-col") class = "lg:w-3/4 max-w-[90%] mx-auto md:text-lg text-sm min-h-screen flex flex-col")

View file

@ -1,4 +1,4 @@
import std/[strutils, sequtils, uri, random] import std/[algorithm, strutils, sequtils, jsconsole, uri, random]
import karax/[kbase, karax, karaxdsl, vdom, jstrutils, ] import karax/[kbase, karax, karaxdsl, vdom, jstrutils, ]
@ -7,7 +7,6 @@ import ../components/tag
import ../utils import ../utils
randomize() randomize()
proc authorRepo(uri: Uri, hostname = false): kstring = proc authorRepo(uri: Uri, hostname = false): kstring =
var name = var name =
if hostname: uri.hostname & uri.path.replace(".git") if hostname: uri.hostname & uri.path.replace(".git")
@ -59,27 +58,29 @@ proc card*(pkg: NimPackage): VNode =
class = "link"): class = "link"):
t.renderTag t.renderTag
proc recentAddedPackagesList*(): VNode = proc getRecentReleases(ctx: Context): seq[NimPackage] =
let pkgs = recentPackagesList() var pkgs: seq[NimPackage]
result = buildHtml(tdiv(class = "flex flex-wrap")): for pkg in ctx.nimpkgs.packages.values():
for pkg in pkgs: if pkg.versions.len > 0:
a(class = borderStyle & "group p-2 m-1 space-x-1 no-underline text-ctp-text)", pkgs.add pkg
href = "/#/pkg/" & pkg.name):
span(class = textStyle & "group-hover:text-ctp-mauve font-bold font-mono-casual"): text pkg.name
proc recentPackageVersionsList*(): VNode = pkgs.sort(sortVersion, order = Descending)
let pkgs = getRecentReleases() return pkgs[0..20]
proc recentPackageVersionList*(ctx: Context): VNode =
let pkgs = ctx.getRecentReleases
result = buildHtml(tdiv(class = "flex flex-wrap")): result = buildHtml(tdiv(class = "flex flex-wrap")):
for pkg in pkgs: for pkg in pkgs:
a(class = borderStyle & "group p-2 m-1 space-x-1 no-underline text-ctp-text)", a(class = borderStyle & "p-2 m-1 space-x-1 no-underline text-ctp-text",
href = "/#/pkg/" & pkg.name): href = "/#/pkg/" & pkg.name):
span(class = textStyle & "group-hover:text-ctp-mauve font-bold font-mono-casual"): text pkg.name span(class = textStyle & "font-bold font-mono-casual"): text pkg.name
span(class = "group-hover:text-ctp-mauve"): text pkg.versions[0].tag span(class = "italic"): text pkg.versions[0].tag
# span: span:
# text " (" & (getTime() - pkg.versions[0].time).inDays.jss & " days ago)" text " (" & (getTime() - pkg.versions[0].time).inDays.jss & " days ago)"
proc randomPackage*(ctx: Context): VNode = proc randomPackage*(ctx: Context): VNode =
let pkgName = ctx.nimpkgs.packages.keys().toSeq().sample() let pkgName = ctx.nimpkgs.packages.keys().toSeq().sample()
console.log pkgName.jss
result = buildHtml(tdiv(class = borderStyle & "my-2 m-1 p-2")): result = buildHtml(tdiv(class = borderStyle & "my-2 m-1 p-2")):
a(href = "/#/pkg/" & pkgName.jss, class = "flex items-center text-ctp-text no-underline"): a(href = "/#/pkg/" & pkgName.jss, class = "flex items-center text-ctp-text no-underline"):
tdiv(class = "i-mdi-dice-6") tdiv(class = "i-mdi-dice-6")

View file

@ -36,7 +36,7 @@ proc selectRandomTags*(ctx: Context): seq[kstring] =
if tag notin result: if tag notin result:
result.add tag result.add tag
proc randomTags*(): VNode = proc randomTags*(ctx: Context): VNode =
let tags = ctx.selectRandomTags() let tags = ctx.selectRandomTags()
buildHtml(tdiv): buildHtml(tdiv):
tags.renderTags tags.renderTags

View file

@ -1,7 +1,10 @@
import std/[ import std/[
asyncjs, jsconsole, jsfetch, sequtils, sugar, tables asyncjs, jsconsole, jsfetch, sequtils, sugar, tables
] ]
import karax/[kbase, karax], jsony
import karax/[kbase, karax]
import jsony
import packages, utils import packages, utils
export tables export tables
@ -33,17 +36,3 @@ discard ctx.fetchPackages
proc nimpkgsList*(): seq[NimPackage] {.inline.} = proc nimpkgsList*(): seq[NimPackage] {.inline.} =
ctx.nimpkgs.packages.values.toSeq() ctx.nimpkgs.packages.values.toSeq()
proc recentPackagesList*(): seq[NimPackage] {.inline.} =
ctx.nimpkgs.recent.mapIt(ctx.nimpkgs.packages[$it])
proc getRecentReleases*(): seq[NimPackage] =
var pkgs: seq[NimPackage]
for pkg in ctx.nimpkgs.packages.values():
if pkg.versions.len > 0:
pkgs.add pkg
pkgs.sort(sortVersion, order = Descending)
return pkgs[0..10]

View file

@ -29,7 +29,6 @@ type
NimPkgs* = object NimPkgs* = object
updated*: Time updated*: Time
recent*: seq[kstring]
packagesHash*: kstring packagesHash*: kstring
packages*: OrderedTable[string, NimPackage] packages*: OrderedTable[string, NimPackage]

View file

@ -1,6 +1,7 @@
import karax/[karaxdsl, vdom] import karax/[karaxdsl, vdom]
import ../components/[search, tag, package] import ../components/[search, tag, package]
import ../context
proc render*(): VNode = proc render*(): VNode =
result = buildHtml(tdiv(class = "justify-center")): result = buildHtml(tdiv(class = "justify-center")):
@ -11,12 +12,11 @@ proc render*(): VNode =
tdiv(class = "flex flex-col md:flex-row grow"): tdiv(class = "flex flex-col md:flex-row grow"):
searchBar() searchBar()
tdiv(): tdiv():
tdiv(): text "explore tags:"
randomTags()
tdiv(): tdiv():
tdiv(): text "recently added packages:" text "explore tags:"
recentAddedPackagesList() ctx.randomTags()
tdiv(): tdiv():
tdiv(): text "recently released versions:" tdiv():
recentPackageVersionsList() text "recently released versions:"
ctx.recentPackageVersionList