Compare commits
1 Commits
renovate/s
...
7b892dcfc0
Author | SHA1 | Date | |
---|---|---|---|
7b892dcfc0 |
@ -26,10 +26,14 @@ jobs:
|
||||
- name: Build image
|
||||
run: |
|
||||
cd app
|
||||
docker build --build-arg WEBSITE_REPORT_URL=https://git.ngn.tf/ngn/website/issues/new \
|
||||
--build-arg WEBSITE_SOURCE_URL=https://git.ngn.tf/ngn/website \
|
||||
--build-arg WEBSITE_DOC_URL=http://doc:7003 \
|
||||
--build-arg WEBSITE_API_URL=http://api:7002 \
|
||||
--build-arg WEBSITE_API_PATH=/api \
|
||||
docker build --build-arg WEBSITE_REPORT_URL=https://git.ngn.tf/ngn/website/issues/new \
|
||||
--build-arg WEBSITE_SOURCE_URL=https://git.ngn.tf/ngn/website \
|
||||
--build-arg WEBSITE_APP_URL_CLEAR=https://ngn.tf \
|
||||
--build-arg WEBSITE_APP_URL_ONION=http://ngntfwmwovvku6eqi7dzzgzv2wzlvq2cqtqha7ccgzub2xnivsuxnuyd.onion \
|
||||
--build-arg WEBSITE_APP_URL_I2P=http://ngn.i2p \
|
||||
--build-arg WEBSITE_API_URL_CLEAR=https://api.ngn.tf \
|
||||
--build-arg WEBSITE_API_URL_ONION=http://api.ngntfwmwovvku6eqi7dzzgzv2wzlvq2cqtqha7ccgzub2xnivsuxnuyd.onion \
|
||||
--build-arg WEBSITE_API_URL_I2P=https://api.ngn.i2p \
|
||||
--build-arg WEBSITE_DOC_URL=http://doc:7003 \
|
||||
--tag ${{env.REGISTRY}}/${{env.IMAGE}}:latest .
|
||||
docker push ${{env.REGISTRY}}/${{env.IMAGE}}:latest
|
||||
|
141
README.md
141
README.md
@ -4,112 +4,85 @@
|
||||

|
||||

|
||||
|
||||
This repo contains all the source code for my personal website,
|
||||
[ngn.tf](https://ngn.tf) All code is licensed under AGPL version 3 (see
|
||||
[LICENSE.txt](LICENSE.txt))
|
||||
This repo contains all the source code for my personal website, [ngn.tf](https://ngn.tf)
|
||||
All code is licensed under AGPL version 3 (see [LICENSE.txt](LICENSE.txt))
|
||||
|
||||
## Directory structure
|
||||
|
||||
### `app`
|
||||
|
||||
Contains frontend application, written with SvelteKit. It supports full SSR.
|
||||
Contains modified CSS from
|
||||
[github-markdown-css](https://github.com/sindresorhus/github-markdown-css) and
|
||||
fonts from [NerdFonts](https://www.nerdfonts.com/)
|
||||
Contains modified CSS from [github-markdown-css](https://github.com/sindresorhus/github-markdown-css)
|
||||
and fonts from [NerdFonts](https://www.nerdfonts.com/)
|
||||
|
||||
### `api`
|
||||
Contains the API server, written in Go. It uses the [Fiber](https://github.com/gofiber/fiber) web
|
||||
framework which offers an [Express](https://expressjs.com/) like experience. I choose Fiber since I've used
|
||||
worked with express a lot in the past. However previously the I was using [Gin](https://github.com/gin-gonic/gin)
|
||||
(see history section).
|
||||
|
||||
Contains the API server, written in Go. It uses the
|
||||
[Fiber](https://github.com/gofiber/fiber) web framework which offers an
|
||||
[Express](https://expressjs.com/) like experience. I choose Fiber since I've
|
||||
used worked with express a lot in the past. However previously the I was using
|
||||
[Gin](https://github.com/gin-gonic/gin) (see history section).
|
||||
|
||||
API stores all the data in a local SQLite(3) database. Go doesn't support
|
||||
SQLite3 out of the box so I'm using
|
||||
[mattn's sqlite3 driver](https://github.com/mattn/go-sqlite3).
|
||||
API stores all the data in a local SQLite(3) database. Go doesn't support SQLite3 out of the box so
|
||||
I'm using [mattn's sqlite3 driver](https://github.com/mattn/go-sqlite3).
|
||||
|
||||
### `doc`
|
||||
|
||||
Contains the documentation server, written in C. It uses the
|
||||
[ctorm](https://github.com/ngn13/ctorm) web framework, which is a framework that
|
||||
I myself wrote. Unlike the frontend application or the API server, it's not
|
||||
accessable by public, the frontend application gets the documentation content
|
||||
from this server and renders it using SSR. The reason I don't use the API for
|
||||
hosting the documentation content is that I want a separate server for hosting
|
||||
Contains the documentation server, written in C. It uses the [ctorm](https://github.com/ngn13/ctorm) web
|
||||
framework, which is a framework that I myself wrote. Unlike the frontend application or the API server, it's not
|
||||
accessable by public, the frontend application gets the documentation content from this server and renders it using
|
||||
SSR. The reason I don't use the API for hosting the documentation content is that I want a separate server for hosting
|
||||
static content, API is only for hosting dynamic stuff.
|
||||
|
||||
### `admin`
|
||||
|
||||
The frontend application does not contain an admin interface, I do the
|
||||
administration stuff (such as adding news posts, adding services etc.) using the
|
||||
python script in this directory. This script can be installed on to the PATH by
|
||||
running the Makefile install script. After installation it can be used by
|
||||
running `admin_script`.
|
||||
The frontend application does not contain an admin interface, I do the administration stuff (such as adding news posts,
|
||||
adding services etc.) using the python script in this directory. This script can be installed on to the PATH by running
|
||||
the Makefile install script. After installation it can be used by running `admin_script`.
|
||||
|
||||
## Deployment
|
||||
|
||||
Easiest way to deploy is to use docker. There is `compose.yml` and a `run.sh`
|
||||
script in the [deploy](deploy/) directory that can be used to startup all the
|
||||
docker containers. Configuration options are passed during build time for the
|
||||
frontend application, and for others it's passed with environment variables.
|
||||
Easiest way to deploy is to use docker. There is `compose.yml` and a `run.sh` script in the [deploy](deploy/) directory
|
||||
that can be used to startup all the docker containers. Configuration options are passed during build time for the frontend
|
||||
application, and for others it's passed with environment variables.
|
||||
|
||||
## History
|
||||
|
||||
Some nostalgic history/changelog stuff (just for the major version numbers):
|
||||
|
||||
- **v0.1 (late 2020 - early 2021)**: First ever version of my website, it was
|
||||
just a simple HTML/CSS page, I never published any of the source code and I
|
||||
wiped the local copy on my USB drive in early 2022, I still remember what it
|
||||
looked like though, it looked like I made entire website in microsoft paint...
|
||||
while blindfoled, so yeah it was shit.
|
||||
- **v0.1 (late 2020 - early 2021)**: First ever version of my website, it was just a simple HTML/CSS page,
|
||||
I never published any of the source code and I wiped the local copy on my USB drive in early 2022, I still
|
||||
remember what it looked like though, it looked like I made entire website in microsoft paint... while blindfoled,
|
||||
so yeah it was shit.
|
||||
|
||||
- **v1.0 (early 2021 - late 2022)**: This version was actualy hosted on my
|
||||
github.io page, and all the source code was (and still is) avaliable, it was
|
||||
just a simple static site, [here is a screenshot](assets/githubio.png).
|
||||
- **v1.0 (early 2021 - late 2022)**: This version was actualy hosted on my github.io page, and all the source code
|
||||
was (and still is) avaliable, it was just a simple static site, [here is a screenshot](assets/githubio.png).
|
||||
|
||||
- **vLOST (late 2022 - early 2023)**: As I learned more JS, I decided to rewrite
|
||||
(and rework) my website with one of the fancy JS frameworks. I decided to go
|
||||
with Svelte. Not the kit version, at the time svelte did not support SSR. I do
|
||||
not remember writting an API for it so I guess I just updated it everytime I
|
||||
wanted to add content? It was pretty much like a static website and was hosted
|
||||
on `ngn13.fun` as at this point I had my own hosting. The source code for this
|
||||
website was in a deleted github repository of mine, I looked for a local copy
|
||||
on my old hard drive but I wasn't able to find it. I also do not remember how
|
||||
it looked like, sooo this version is pretty much lost :(
|
||||
- **vLOST (late 2022 - early 2023)**: As I learned more JS, I decided to rewrite (and rework) my website with one
|
||||
of the fancy JS frameworks. I decided to go with Svelte. Not the kit version, at the time svelte did not support SSR.
|
||||
I do not remember writting an API for it so I guess I just updated it everytime I wanted to add content? It was pretty
|
||||
much like a static website and was hosted on `ngn13.fun` as at this point I had my own hosting. The source code for
|
||||
this website was in a deleted github repository of mine, I looked for a local copy on my old hard drive but I wasn't able
|
||||
to find it. I also do not remember how it looked like, sooo this version is pretty much lost :(
|
||||
|
||||
- **v2.0 (early 2023 - late 2023)**: After I discovered what SSR is, I decided
|
||||
to rewrite and rework my website one more time in NuxtJS. I had really "fun"
|
||||
time using vue stuff. As NuxtJS supported server-side code, this website had
|
||||
its own built in API. This website was also hosted on `ngn13.fun`. This also
|
||||
the first version that lives on this git repository.
|
||||
- **v2.0 (early 2023 - late 2023)**: After I discovered what SSR is, I decided to rewrite and rework my website one more
|
||||
time in NuxtJS. I had really "fun" time using vue stuff. As NuxtJS supported server-side code, this website had its own
|
||||
built in API. This website was also hosted on `ngn13.fun`. This also the first version that lives on this git repository.
|
||||
|
||||
- **v3.0 (2023 august - 2023 november)**: In agust of 2023, I decided to rewrite
|
||||
and rework my website again, this time I was going with SvelteKit as I haven't
|
||||
had the greatest experience with NuxtJS. SvelteKit was really fun to work with
|
||||
and I got my new website done pretty quickly. (I don't wanna brag or something
|
||||
but I really imporeved the CSS/styling stuff ya know). I also wrote a new API
|
||||
with Go and Gin. I did not publish the source code for the API, the code lived
|
||||
on my local git server until I deleted it when I was done with 6.0. This
|
||||
website was hosted on `ngn13.fun` as well.
|
||||
- **v3.0 (2023 august - 2023 november)**: In agust of 2023, I decided to rewrite and rework my website again, this time
|
||||
I was going with SvelteKit as I haven't had the greatest experience with NuxtJS. SvelteKit was really fun to work with
|
||||
and I got my new website done pretty quickly. (I don't wanna brag or something but I really imporeved the CSS/styling
|
||||
stuff ya know). I also wrote a new API with Go and Gin. I did not publish the source code for the API, the code lived
|
||||
on my local git server until I deleted it when I was done with 6.0. This website was hosted on `ngn13.fun` as well.
|
||||
|
||||
- **v4.0 (2023 november - 2024 october)**: In this version the frontend was
|
||||
still similar to 3.0, the big changes are in the API. I rewrote the API with
|
||||
Fiber. This version was the first version hosted on `ngn.tf` which is my new
|
||||
domain name. Here is a [picture of the index](assets/4.0_index.png) and the
|
||||
[blog page](assets/4.0_blog.png).
|
||||
- **v4.0 (2023 november - 2024 october)**: In this version the frontend was still similar to 3.0, the big changes are in
|
||||
the API. I rewrote the API with Fiber. This version was the first version hosted on `ngn.tf` which is my new domain name.
|
||||
Here is a [picture of the index](assets/4.0_index.png) and the [blog page](assets/4.0_blog.png).
|
||||
|
||||
- **v5.0 (2024 october - 2025 january)**: This version just had simple frontend
|
||||
UI changes compared to 4.0, at this point I was thinking about doing a massive
|
||||
rework (which I did with 6.0), however I was working on some other shit at the
|
||||
time, so I just did some small changes with the limited time I had for this
|
||||
project.
|
||||
- **v5.0 (2024 october - 2025 january)**: This version just had simple frontend UI changes compared to 4.0, at this
|
||||
point I was thinking about doing a massive rework (which I did with 6.0), however I was working on some other shit at
|
||||
the time, so I just did some small changes with the limited time I had for this project.
|
||||
|
||||
- **v6.0 (2025 january - ...)**: The current major version of my website,
|
||||
frontend had a massive rework, API has been cleaned up and extended to do
|
||||
status checking for the services I host. The `doc` server has been added to
|
||||
the mix so I can host static documentation. The most important thing about
|
||||
this version is that it adds multi-language support, so literally everything
|
||||
on the website (including the API and documentation content) is localized for
|
||||
both English and Turkish, which was something I wanted to do for the longest
|
||||
time ever.
|
||||
- **v6.0 (2025 january - ...)**: The current major version of my website, frontend had a massive rework, API has been
|
||||
cleaned up and extended to do status checking for the services I host. The `doc` server has been added to the mix
|
||||
so I can host static documentation. The most important thing about this version is that it adds multi-language support,
|
||||
so literally everything on the website (including the API and documentation content) is localized for both English
|
||||
and Turkish, which was something I wanted to do for the longest time ever.
|
||||
|
||||
Damn it has been 4 years since I wrote that shit HTML page huh? Time flies...
|
||||
|
||||
## Screenshots (from v6.0)
|
||||

|
||||

|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM golang:1.24.4
|
||||
FROM golang:1.24.2
|
||||
|
||||
WORKDIR /api
|
||||
|
||||
|
@ -3,47 +3,107 @@ package config
|
||||
import (
|
||||
"fmt"
|
||||
"net/url"
|
||||
|
||||
"github.com/ngn13/ortam"
|
||||
"os"
|
||||
)
|
||||
|
||||
type Type struct {
|
||||
Debug bool // should display debug messgaes?
|
||||
AppUrl *url.URL // frontend application URL for the website
|
||||
Password string // admin password
|
||||
Host string // host the server should listen on
|
||||
IPHeader string // header that should be checked for obtaining the client IP
|
||||
Interval string // service status check interval
|
||||
Timeout string // timeout for the service status check
|
||||
Limit string // if the service responds slower than this limit, it will be marked as "slow"
|
||||
Options []Option
|
||||
Count int
|
||||
}
|
||||
|
||||
func Load() (*Type, error) {
|
||||
var conf = Type{
|
||||
Debug: false,
|
||||
Password: "",
|
||||
Host: "0.0.0.0:7002",
|
||||
IPHeader: "X-Real-IP",
|
||||
Interval: "1h",
|
||||
Timeout: "15s",
|
||||
Limit: "5s",
|
||||
func (c *Type) Find(name string, typ uint8) (*Option, error) {
|
||||
for i := 0; i < c.Count; i++ {
|
||||
if c.Options[i].Name != name {
|
||||
continue
|
||||
}
|
||||
|
||||
if c.Options[i].Type != typ {
|
||||
return nil, fmt.Errorf("bad option type")
|
||||
}
|
||||
|
||||
return &c.Options[i], nil
|
||||
}
|
||||
|
||||
if err := ortam.Load(&conf, "WEBSITE"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if conf.AppUrl == nil {
|
||||
conf.AppUrl, _ = url.Parse("http://localhost:7001/")
|
||||
}
|
||||
|
||||
if conf.Password == "" {
|
||||
return nil, fmt.Errorf("password is not specified")
|
||||
}
|
||||
|
||||
if conf.Host == "" {
|
||||
return nil, fmt.Errorf("host address is not specified")
|
||||
}
|
||||
|
||||
return &conf, nil
|
||||
return nil, fmt.Errorf("option not found")
|
||||
}
|
||||
|
||||
func (c *Type) Load() (err error) {
|
||||
var (
|
||||
env_val string
|
||||
env_name string
|
||||
opt *Option
|
||||
exists bool
|
||||
)
|
||||
|
||||
// default options
|
||||
c.Options = []Option{
|
||||
{Name: "debug", Value: "false", Type: OPTION_TYPE_BOOL, Required: true}, // should display debug messgaes?
|
||||
{Name: "app_url_clear", Value: "http://localhost:7001/", Type: OPTION_TYPE_URL, Required: true}, // frontend application URL for the website
|
||||
{Name: "password", Value: "", Type: OPTION_TYPE_STR, Required: true}, // admin password
|
||||
{Name: "host", Value: "0.0.0.0:7002", Type: OPTION_TYPE_STR, Required: true}, // host the server should listen on
|
||||
{Name: "ip_header", Value: "X-Real-IP", Type: OPTION_TYPE_STR, Required: false}, // header that should be checked for obtaining the client IP
|
||||
{Name: "interval", Value: "1h", Type: OPTION_TYPE_STR, Required: false}, // service status check interval
|
||||
{Name: "timeout", Value: "15s", Type: OPTION_TYPE_STR, Required: false}, // timeout for the service status check
|
||||
{Name: "limit", Value: "5s", Type: OPTION_TYPE_STR, Required: false}, // if the service responds slower than this limit, it will be marked as "slow"
|
||||
}
|
||||
c.Count = len(c.Options)
|
||||
|
||||
for i := 0; i < c.Count; i++ {
|
||||
opt = &c.Options[i]
|
||||
|
||||
env_name = opt.Env()
|
||||
|
||||
if env_val, exists = os.LookupEnv(env_name); exists {
|
||||
opt.Value = env_val
|
||||
}
|
||||
|
||||
if opt.Value == "" && opt.Required {
|
||||
return fmt.Errorf("please specify a value for the config option \"%s\" (\"%s\")", opt.Name, env_name)
|
||||
}
|
||||
|
||||
if err = opt.Load(); err != nil {
|
||||
return fmt.Errorf("failed to load option \"%s\" (\"%s\"): %s", opt.Name, env_name, err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Type) GetStr(name string) string {
|
||||
var (
|
||||
opt *Option
|
||||
err error
|
||||
)
|
||||
|
||||
if opt, err = c.Find(name, OPTION_TYPE_STR); err != nil {
|
||||
return ""
|
||||
}
|
||||
|
||||
return opt.TypeValue.Str
|
||||
}
|
||||
|
||||
func (c *Type) GetBool(name string) bool {
|
||||
var (
|
||||
opt *Option
|
||||
err error
|
||||
)
|
||||
|
||||
if opt, err = c.Find(name, OPTION_TYPE_BOOL); err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
return opt.TypeValue.Bool
|
||||
}
|
||||
|
||||
func (c *Type) GetURL(name string) *url.URL {
|
||||
var (
|
||||
opt *Option
|
||||
err error
|
||||
)
|
||||
|
||||
if opt, err = c.Find(name, OPTION_TYPE_URL); err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
return opt.TypeValue.URL
|
||||
}
|
||||
|
49
api/config/option.go
Normal file
49
api/config/option.go
Normal file
@ -0,0 +1,49 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/url"
|
||||
"strings"
|
||||
)
|
||||
|
||||
const (
|
||||
OPTION_TYPE_STR = 0
|
||||
OPTION_TYPE_BOOL = 1
|
||||
OPTION_TYPE_URL = 2
|
||||
)
|
||||
|
||||
type Option struct {
|
||||
Name string
|
||||
Value string
|
||||
Required bool
|
||||
Type uint8
|
||||
TypeValue struct {
|
||||
URL *url.URL
|
||||
Str string
|
||||
Bool bool
|
||||
}
|
||||
}
|
||||
|
||||
func (o *Option) Env() string {
|
||||
return strings.ToUpper(fmt.Sprintf("WEBSITE_%s", o.Name))
|
||||
}
|
||||
|
||||
func (o *Option) Load() (err error) {
|
||||
err = nil
|
||||
|
||||
switch o.Type {
|
||||
case OPTION_TYPE_STR:
|
||||
o.TypeValue.Str = o.Value
|
||||
|
||||
case OPTION_TYPE_BOOL:
|
||||
o.TypeValue.Bool = "1" == o.Value || "true" == strings.ToLower(o.Value)
|
||||
|
||||
case OPTION_TYPE_URL:
|
||||
o.TypeValue.URL, err = url.Parse(o.Value)
|
||||
|
||||
default:
|
||||
return fmt.Errorf("invalid option type")
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
@ -1,11 +1,10 @@
|
||||
module github.com/ngn13/website/api
|
||||
|
||||
go 1.24.0
|
||||
go 1.21.3
|
||||
|
||||
require (
|
||||
github.com/gofiber/fiber/v2 v2.52.8
|
||||
github.com/mattn/go-sqlite3 v1.14.28
|
||||
github.com/ngn13/ortam v0.0.0-20250421004351-8dea81680817
|
||||
github.com/gofiber/fiber/v2 v2.52.6
|
||||
github.com/mattn/go-sqlite3 v1.14.27
|
||||
)
|
||||
|
||||
require (
|
||||
|
22
api/go.sum
22
api/go.sum
@ -1,11 +1,17 @@
|
||||
github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
|
||||
github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
|
||||
github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
|
||||
github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
|
||||
github.com/gofiber/fiber/v2 v2.52.5 h1:tWoP1MJQjGEe4GB5TUGOi7P2E0ZMMRx5ZTG4rT+yGMo=
|
||||
github.com/gofiber/fiber/v2 v2.52.5/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ=
|
||||
github.com/gofiber/fiber/v2 v2.52.6 h1:Rfp+ILPiYSvvVuIPvxrBns+HJp8qGLDnLJawAu27XVI=
|
||||
github.com/gofiber/fiber/v2 v2.52.6/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=
|
||||
github.com/gofiber/fiber/v2 v2.52.8 h1:xl4jJQ0BV5EJTA2aWiKw/VddRpHrKeZLF0QPUxqn0x4=
|
||||
github.com/gofiber/fiber/v2 v2.52.8/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=
|
||||
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
|
||||
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM=
|
||||
github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
|
||||
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
|
||||
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
|
||||
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
|
||||
@ -13,16 +19,14 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
|
||||
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
|
||||
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
|
||||
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||
github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
|
||||
github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
|
||||
github.com/mattn/go-sqlite3 v1.14.27 h1:drZCnuvf37yPfs95E5jd9s3XhdVWLal+6BOK6qrv6IU=
|
||||
github.com/mattn/go-sqlite3 v1.14.27/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
|
||||
github.com/mattn/go-sqlite3 v1.14.28 h1:ThEiQrnbtumT+QMknw63Befp/ce/nUPgBPMlRFEum7A=
|
||||
github.com/mattn/go-sqlite3 v1.14.28/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
|
||||
github.com/ngn13/ortam v0.0.0-20250412195317-e76e62a7a305 h1:1YxtSMwR14PklXNlZxIqcmfpiq2+G98YNmhSuz7GKCQ=
|
||||
github.com/ngn13/ortam v0.0.0-20250412195317-e76e62a7a305/go.mod h1:MSJZ4ZstrLvVEvivbp9hhup+iL8rvtpgKcYaF3DSOKk=
|
||||
github.com/ngn13/ortam v0.0.0-20250421004351-8dea81680817 h1:WkHM4w51N5jCsWcDVcPsXz3zhi/kCfNp/VGh2uPjwsk=
|
||||
github.com/ngn13/ortam v0.0.0-20250421004351-8dea81680817/go.mod h1:MSJZ4ZstrLvVEvivbp9hhup+iL8rvtpgKcYaF3DSOKk=
|
||||
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
|
||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
|
||||
@ -33,5 +37,7 @@ github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVS
|
||||
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
|
||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
|
||||
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
|
||||
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
|
14
api/main.go
14
api/main.go
@ -36,18 +36,18 @@ func main() {
|
||||
app *fiber.App
|
||||
stat status.Type
|
||||
|
||||
conf *config.Type
|
||||
conf config.Type
|
||||
db database.Type
|
||||
|
||||
err error
|
||||
)
|
||||
|
||||
if conf, err = config.Load(); err != nil {
|
||||
if err = conf.Load(); err != nil {
|
||||
util.Fail("failed to load the configuration: %s", err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
if !conf.Debug {
|
||||
if !conf.GetBool("debug") {
|
||||
util.Debg = func(m string, v ...any) {}
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@ func main() {
|
||||
return
|
||||
}
|
||||
|
||||
if err = stat.Setup(conf, &db); err != nil {
|
||||
if err = stat.Setup(&conf, &db); err != nil {
|
||||
util.Fail("failed to setup the status checker: %s", err.Error())
|
||||
return
|
||||
}
|
||||
@ -75,7 +75,7 @@ func main() {
|
||||
c.Set("Access-Control-Allow-Methods", "PUT, DELETE, GET") // POST can be sent from HTML forms, so I prefer PUT for API endpoints
|
||||
|
||||
c.Locals("status", &stat)
|
||||
c.Locals("config", conf)
|
||||
c.Locals("config", &conf)
|
||||
c.Locals("database", &db)
|
||||
|
||||
return c.Next()
|
||||
@ -121,9 +121,9 @@ func main() {
|
||||
}
|
||||
|
||||
// start the app
|
||||
util.Info("starting web server on %s", conf.Host)
|
||||
util.Info("starting web server on %s", conf.GetStr("host"))
|
||||
|
||||
if err = app.Listen(conf.Host); err != nil {
|
||||
if err = app.Listen(conf.GetStr("host")); err != nil {
|
||||
util.Fail("failed to start the web server: %s", err.Error())
|
||||
}
|
||||
|
||||
|
@ -21,7 +21,7 @@ func admin_log(c *fiber.Ctx, m string) error {
|
||||
func AuthMiddleware(c *fiber.Ctx) error {
|
||||
conf := c.Locals("config").(*config.Type)
|
||||
|
||||
if c.Get("Authorization") != conf.Password {
|
||||
if c.Get("Authorization") != conf.GetStr("password") {
|
||||
return util.ErrAuth(c)
|
||||
}
|
||||
|
||||
|
@ -7,7 +7,8 @@ import (
|
||||
|
||||
func GET_Index(c *fiber.Ctx) error {
|
||||
conf := c.Locals("config").(*config.Type)
|
||||
app := conf.GetURL("app_url_clear")
|
||||
|
||||
// redirect to the API documentation
|
||||
return c.Redirect(conf.AppUrl.JoinPath("/doc/api").String())
|
||||
return c.Redirect(app.JoinPath("/doc/api").String())
|
||||
}
|
||||
|
@ -40,6 +40,7 @@ func GET_News(c *fiber.Ctx) error {
|
||||
|
||||
db := c.Locals("database").(*database.Type)
|
||||
conf := c.Locals("config").(*config.Type)
|
||||
app := conf.GetURL("app_url_clear")
|
||||
lang := c.Params("lang")
|
||||
|
||||
if lang == "" || len(lang) != 2 {
|
||||
@ -62,10 +63,10 @@ func GET_News(c *fiber.Ctx) error {
|
||||
})
|
||||
|
||||
if feed, err = util.Render("views/news.xml", fiber.Map{
|
||||
"app_url": conf.AppUrl,
|
||||
"updated": time.Now().Format(time.RFC3339),
|
||||
"entries": entries,
|
||||
"lang": lang,
|
||||
"app": app,
|
||||
}); err != nil {
|
||||
return util.ErrInternal(c, err)
|
||||
}
|
||||
|
@ -66,24 +66,29 @@ func (s *Type) loop() {
|
||||
|
||||
func (s *Type) Setup(conf *config.Type, db *database.Type) error {
|
||||
var (
|
||||
dur time.Duration
|
||||
err error
|
||||
dur time.Duration
|
||||
iv, to, lm string
|
||||
err error
|
||||
)
|
||||
|
||||
if conf.Interval == "" || conf.Timeout == "" || conf.Limit == "" {
|
||||
iv = conf.GetStr("interval")
|
||||
to = conf.GetStr("timeout")
|
||||
lm = conf.GetStr("limit")
|
||||
|
||||
if iv == "" || to == "" || lm == "" {
|
||||
s.disabled = true
|
||||
return nil
|
||||
}
|
||||
|
||||
if dur, err = util.GetDuration(conf.Interval); err != nil {
|
||||
if dur, err = util.GetDuration(iv); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if s.timeout, err = util.GetDuration(conf.Timeout); err != nil {
|
||||
if s.timeout, err = util.GetDuration(iv); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if s.limit, err = util.GetDuration(conf.Limit); err != nil {
|
||||
if s.limit, err = util.GetDuration(iv); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
@ -10,9 +10,10 @@ import (
|
||||
|
||||
func IP(c *fiber.Ctx) string {
|
||||
conf := c.Locals("config").(*config.Type)
|
||||
ip_header := conf.GetStr("ip_header")
|
||||
|
||||
if conf.IPHeader != "" && c.Get(conf.IPHeader) != "" {
|
||||
return strings.Clone(c.Get(conf.IPHeader))
|
||||
if ip_header != "" && c.Get(ip_header) != "" {
|
||||
return strings.Clone(c.Get(ip_header))
|
||||
}
|
||||
|
||||
return c.IP()
|
||||
|
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><feed xmlns="http://www.w3.org/2005/Atom">
|
||||
<title>{{.app_url.Host}} news</title>
|
||||
<title>{{.app.Host}} news</title>
|
||||
<updated>{{.updated}}</updated>
|
||||
<subtitle>News and updates about my projects and self-hosted services</subtitle>
|
||||
<link href="{{.app_url.JoinPath "/news"}}"></link>
|
||||
<link href="{{.app.JoinPath "/news"}}"></link>
|
||||
{{ range .entries }}
|
||||
<entry>
|
||||
<title>{{.Title}}</title>
|
||||
|
@ -1,17 +1,32 @@
|
||||
# build the application with node
|
||||
FROM node:23.11.1 AS build
|
||||
FROM node:23.11.0 AS build
|
||||
|
||||
# app URLs
|
||||
ARG WEBSITE_APP_URL_CLEAR
|
||||
ARG WEBSITE_APP_URL_ONION
|
||||
ARG WEBSITE_APP_URL_I2P
|
||||
|
||||
ENV WEBSITE_APP_URL_CLEAR=$WEBSITE_APP_URL_CLEAR
|
||||
ENV WEBSITE_APP_URL_ONION=$WEBSITE_APP_URL_ONION
|
||||
ENV WEBSITE_APP_URL_I2P=$WEBSITE_APP_URL_I2P
|
||||
|
||||
# API URLs
|
||||
ARG WEBSITE_API_URL_CLEAR
|
||||
ARG WEBSITE_API_URL_ONION
|
||||
ARG WEBSITE_API_URL_I2P
|
||||
|
||||
ENV WEBSITE_API_URL_CLEAR=$WEBSITE_API_URL_CLEAR
|
||||
ENV WEBSITE_API_URL_ONION=$WEBSITE_API_URL_ONION
|
||||
ENV WEBSITE_API_URL_I2P=$WEBSITE_API_URL_I2P
|
||||
|
||||
# other config
|
||||
ARG WEBSITE_REPORT_URL
|
||||
ARG WEBSITE_SOURCE_URL
|
||||
ARG WEBSITE_DOC_URL
|
||||
ARG WEBSITE_API_URL
|
||||
ARG WEBSITE_API_PATH
|
||||
|
||||
ENV WEBSITE_REPORT_URL=$WEBSITE_REPORT_URL
|
||||
ENV WEBSITE_SOURCE_URL=$WEBSITE_SOURCE_URL
|
||||
ENV WEBSITE_DOC_URL=$WEBSITE_DOC_URL
|
||||
ENV WEBSITE_API_URL=$WEBSITE_API_URL
|
||||
ENV WEBSITE_API_PATH=$WEBSITE_API_PATH
|
||||
|
||||
WORKDIR /app
|
||||
COPY . /app
|
||||
|
100
app/package-lock.json
generated
100
app/package-lock.json
generated
@ -1,19 +1,19 @@
|
||||
{
|
||||
"name": "website",
|
||||
"version": "6.3",
|
||||
"version": "6.2",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "website",
|
||||
"version": "6.3",
|
||||
"version": "6.2",
|
||||
"dependencies": {
|
||||
"dompurify": "^3.2.3",
|
||||
"marked": "^15.0.6",
|
||||
"svelte-i18n": "^4.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@sveltejs/adapter-auto": "^6.0.0",
|
||||
"@sveltejs/adapter-auto": "^4.0.0",
|
||||
"@sveltejs/adapter-node": "^5.2.11",
|
||||
"@sveltejs/kit": "^2.15.1",
|
||||
"@sveltejs/vite-plugin-svelte": "^4.0.3",
|
||||
@ -841,11 +841,14 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@sveltejs/adapter-auto": {
|
||||
"version": "6.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@sveltejs/adapter-auto/-/adapter-auto-6.0.1.tgz",
|
||||
"integrity": "sha512-mcWud3pYGPWM2Pphdj8G9Qiq24nZ8L4LB7coCUckUEy5Y7wOWGJ/enaZ4AtJTcSm5dNK1rIkBRoqt+ae4zlxcQ==",
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@sveltejs/adapter-auto/-/adapter-auto-4.0.0.tgz",
|
||||
"integrity": "sha512-kmuYSQdD2AwThymQF0haQhM8rE5rhutQXG4LNbnbShwhMO4qQGnKaaTy+88DuNSuoQDi58+thpq8XpHc1+oEKQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"import-meta-resolve": "^4.1.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@sveltejs/kit": "^2.0.0"
|
||||
}
|
||||
@ -867,25 +870,23 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@sveltejs/kit": {
|
||||
"version": "2.22.2",
|
||||
"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.22.2.tgz",
|
||||
"integrity": "sha512-2MvEpSYabUrsJAoq5qCOBGAlkICjfjunrnLcx3YAk2XV7TvAIhomlKsAgR4H/4uns5rAfYmj7Wet5KRtc8dPIg==",
|
||||
"version": "2.20.4",
|
||||
"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.20.4.tgz",
|
||||
"integrity": "sha512-B3Y1mb1Qjt57zXLVch5tfqsK/ebHe6uYTcFSnGFNwRpId3+fplLgQK6Z2zhDVBezSsPuhDq6Pry+9PA88ocN6Q==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@sveltejs/acorn-typescript": "^1.0.5",
|
||||
"@types/cookie": "^0.6.0",
|
||||
"acorn": "^8.14.1",
|
||||
"cookie": "^0.6.0",
|
||||
"devalue": "^5.1.0",
|
||||
"esm-env": "^1.2.2",
|
||||
"import-meta-resolve": "^4.1.0",
|
||||
"kleur": "^4.1.5",
|
||||
"magic-string": "^0.30.5",
|
||||
"mrmime": "^2.0.0",
|
||||
"sade": "^1.8.1",
|
||||
"set-cookie-parser": "^2.6.0",
|
||||
"sirv": "^3.0.0",
|
||||
"vitefu": "^1.0.6"
|
||||
"sirv": "^3.0.0"
|
||||
},
|
||||
"bin": {
|
||||
"svelte-kit": "svelte-kit.js"
|
||||
@ -894,9 +895,9 @@
|
||||
"node": ">=18.13"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0",
|
||||
"@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0",
|
||||
"svelte": "^4.0.0 || ^5.0.0-next.0",
|
||||
"vite": "^5.0.3 || ^6.0.0 || ^7.0.0-beta.0"
|
||||
"vite": "^5.0.3 || ^6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@sveltejs/vite-plugin-svelte": {
|
||||
@ -965,10 +966,9 @@
|
||||
"optional": true
|
||||
},
|
||||
"node_modules/acorn": {
|
||||
"version": "8.14.1",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
|
||||
"integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
|
||||
"license": "MIT",
|
||||
"version": "8.14.0",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
|
||||
"integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
|
||||
"bin": {
|
||||
"acorn": "bin/acorn"
|
||||
},
|
||||
@ -1084,9 +1084,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/dompurify": {
|
||||
"version": "3.2.6",
|
||||
"resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.6.tgz",
|
||||
"integrity": "sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==",
|
||||
"version": "3.2.5",
|
||||
"resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.5.tgz",
|
||||
"integrity": "sha512-mLPd29uoRe9HpvwP2TxClGQBzGXeEC/we/q+bFlmPPmj2p2Ugl3r6ATu/UU1v77DXNcehiBg9zsr1dREyA/dJQ==",
|
||||
"license": "(MPL-2.0 OR Apache-2.0)",
|
||||
"optionalDependencies": {
|
||||
"@types/trusted-types": "^2.0.7"
|
||||
@ -1204,9 +1204,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/esrap": {
|
||||
"version": "1.4.9",
|
||||
"resolved": "https://registry.npmjs.org/esrap/-/esrap-1.4.9.tgz",
|
||||
"integrity": "sha512-3OMlcd0a03UGuZpPeUC1HxR3nA23l+HEyCiZw3b3FumJIN9KphoGzDJKMXI1S72jVS1dsenDyQC0kJlO1U9E1g==",
|
||||
"version": "1.4.6",
|
||||
"resolved": "https://registry.npmjs.org/esrap/-/esrap-1.4.6.tgz",
|
||||
"integrity": "sha512-F/D2mADJ9SHY3IwksD4DAXjTt7qt7GWUf3/8RhCNWmC/67tyb55dpimHmy7EplakFaflV0R/PC+fdSPqrRHAQw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@jridgewell/sourcemap-codec": "^1.4.15"
|
||||
@ -1299,6 +1299,17 @@
|
||||
"node": ">= 0.4"
|
||||
}
|
||||
},
|
||||
"node_modules/import-meta-resolve": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
|
||||
"integrity": "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"funding": {
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/wooorm"
|
||||
}
|
||||
},
|
||||
"node_modules/intl-messageformat": {
|
||||
"version": "10.7.11",
|
||||
"resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.11.tgz",
|
||||
@ -1385,9 +1396,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/marked": {
|
||||
"version": "15.0.12",
|
||||
"resolved": "https://registry.npmjs.org/marked/-/marked-15.0.12.tgz",
|
||||
"integrity": "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==",
|
||||
"version": "15.0.7",
|
||||
"resolved": "https://registry.npmjs.org/marked/-/marked-15.0.7.tgz",
|
||||
"integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==",
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"marked": "bin/marked.js"
|
||||
@ -1532,9 +1543,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/prettier-plugin-svelte": {
|
||||
"version": "3.4.0",
|
||||
"resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.4.0.tgz",
|
||||
"integrity": "sha512-pn1ra/0mPObzqoIQn/vUTR3ZZI6UuZ0sHqMK5x2jMLGrs53h0sXhkVuDcrlssHwIMk7FYrMjHBPoUSyyEEDlBQ==",
|
||||
"version": "3.3.3",
|
||||
"resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.3.3.tgz",
|
||||
"integrity": "sha512-yViK9zqQ+H2qZD1w/bH7W8i+bVfKrD8GIFjkFe4Thl6kCT9SlAsXVNmt3jCvQOCsnOhcvYgsoVlRV/Eu6x5nNw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
@ -1650,9 +1661,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/svelte": {
|
||||
"version": "5.34.7",
|
||||
"resolved": "https://registry.npmjs.org/svelte/-/svelte-5.34.7.tgz",
|
||||
"integrity": "sha512-5PEg+QQKce4t1qiOtVUhUS3AQRTtxJyGBTpxLcNWnr0Ve8q4r06bMo0Gv8uhtCPWlztZHoi3Ye7elLhu+PCTMg==",
|
||||
"version": "5.25.8",
|
||||
"resolved": "https://registry.npmjs.org/svelte/-/svelte-5.25.8.tgz",
|
||||
"integrity": "sha512-yRmjmT5rgCZUMfCKS5varGlSe/nQyr2oClyIirbBChfTFc00YjVAyVWo1zOH74La3hi5KRSkNJKncyJ04PwIYA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@ampproject/remapping": "^2.3.0",
|
||||
@ -1664,7 +1675,7 @@
|
||||
"axobject-query": "^4.1.0",
|
||||
"clsx": "^2.1.1",
|
||||
"esm-env": "^1.2.1",
|
||||
"esrap": "^1.4.8",
|
||||
"esrap": "^1.4.6",
|
||||
"is-reference": "^3.0.3",
|
||||
"locate-character": "^3.0.0",
|
||||
"magic-string": "^0.30.11",
|
||||
@ -2149,9 +2160,9 @@
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/vite": {
|
||||
"version": "5.4.19",
|
||||
"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.19.tgz",
|
||||
"integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==",
|
||||
"version": "5.4.17",
|
||||
"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.17.tgz",
|
||||
"integrity": "sha512-5+VqZryDj4wgCs55o9Lp+p8GE78TLVg0lasCH5xFZ4jacZjtqZa6JUw9/p0WeAojaOfncSM6v77InkFPGnvPvg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@ -2209,17 +2220,12 @@
|
||||
}
|
||||
},
|
||||
"node_modules/vitefu": {
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/vitefu/-/vitefu-1.0.6.tgz",
|
||||
"integrity": "sha512-+Rex1GlappUyNN6UfwbVZne/9cYC4+R2XDk9xkNXBKMw6HQagdX9PgZ8V2v1WUSK1wfBLp7qbI1+XSNIlB1xmA==",
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/vitefu/-/vitefu-1.0.3.tgz",
|
||||
"integrity": "sha512-iKKfOMBHob2WxEJbqbJjHAkmYgvFDPhuqrO82om83S8RLk+17FtyMBfcyeH8GqD0ihShtkMW/zzJgiA51hCNCQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"workspaces": [
|
||||
"tests/deps/*",
|
||||
"tests/projects/*"
|
||||
],
|
||||
"peerDependencies": {
|
||||
"vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
|
||||
"vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0-beta.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"vite": {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "website",
|
||||
"version": "6.3",
|
||||
"version": "6.2",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "vite dev",
|
||||
@ -10,7 +10,7 @@
|
||||
"format": "prettier --write ."
|
||||
},
|
||||
"devDependencies": {
|
||||
"@sveltejs/adapter-auto": "^6.0.0",
|
||||
"@sveltejs/adapter-auto": "^4.0.0",
|
||||
"@sveltejs/adapter-node": "^5.2.11",
|
||||
"@sveltejs/kit": "^2.15.1",
|
||||
"@sveltejs/vite-plugin-svelte": "^4.0.3",
|
||||
|
@ -1,14 +1,9 @@
|
||||
import { browser } from "$app/environment";
|
||||
import { urljoin } from "$lib/util.js";
|
||||
import { urljoin, env_url } from "$lib/util.js";
|
||||
|
||||
const api_version = "v1";
|
||||
|
||||
function api_urljoin(path = null, query = {}) {
|
||||
let api_url = "";
|
||||
|
||||
if (browser) api_url = urljoin(import.meta.env.WEBSITE_API_PATH, api_version);
|
||||
else api_url = urljoin(import.meta.env.WEBSITE_API_URL, api_version);
|
||||
|
||||
let api_url = urljoin(env_url("API"), api_version);
|
||||
return urljoin(api_url, path, query);
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { urljoin } from "$lib/util.js";
|
||||
import { urljoin, env_url } from "$lib/util.js";
|
||||
|
||||
function doc_urljoin(path = null, query = {}) {
|
||||
return urljoin(import.meta.env.WEBSITE_DOC_URL, path, query);
|
||||
|
@ -1,16 +1,14 @@
|
||||
<script>
|
||||
import { color, date_from_ts } from "$lib/util.js";
|
||||
import { app_url, color, date_from_ts } from "$lib/util.js";
|
||||
import { api_get_metrics } from "$lib/api.js";
|
||||
import Link from "$lib/link.svelte";
|
||||
|
||||
import { onMount } from "svelte";
|
||||
import { _ } from "svelte-i18n";
|
||||
|
||||
let show_counter = false,
|
||||
data = {};
|
||||
let data = {};
|
||||
|
||||
onMount(async () => {
|
||||
show_counter = true;
|
||||
data = await api_get_metrics(fetch);
|
||||
});
|
||||
</script>
|
||||
@ -22,28 +20,24 @@
|
||||
</span>
|
||||
<span>/</span>
|
||||
<span>
|
||||
<Link link="/doc/license" bold={true}>{$_("footer.license")}</Link>
|
||||
<Link link={app_url("/doc/license")} bold={true}>{$_("footer.license")}</Link>
|
||||
</span>
|
||||
<span>/</span>
|
||||
<span>
|
||||
<Link link="/doc/privacy" bold={true}>{$_("footer.privacy")}</Link>
|
||||
<Link link={app_url("/doc/privacy")} bold={true}>{$_("footer.privacy")}</Link>
|
||||
</span>
|
||||
</div>
|
||||
{#if show_counter}
|
||||
<span class="counter">
|
||||
{$_("footer.number", {
|
||||
values: {
|
||||
total: data.total,
|
||||
since: date_from_ts(data.since),
|
||||
},
|
||||
})}
|
||||
{#if data.number % 1000 == 0}
|
||||
<span style="color: var(--{color()})">({$_("footer.wow")})</span>
|
||||
{/if}
|
||||
</span>
|
||||
{:else}
|
||||
<span class="counter">{$_("footer.js")}</span>
|
||||
{/if}
|
||||
<span class="counter">
|
||||
{$_("footer.number", {
|
||||
values: {
|
||||
total: data.total,
|
||||
since: date_from_ts(data.since),
|
||||
},
|
||||
})}
|
||||
{#if data.number % 1000 == 0}
|
||||
<span style="color: var(--{color()})">({$_("footer.wow")})</span>
|
||||
{/if}
|
||||
</span>
|
||||
</footer>
|
||||
|
||||
<style>
|
||||
|
@ -1,5 +1,7 @@
|
||||
<script>
|
||||
import { api_urljoin } from "$lib/api.js";
|
||||
import { app_url } from "$lib/util.js";
|
||||
|
||||
export let desc, title;
|
||||
</script>
|
||||
|
||||
@ -14,6 +16,7 @@
|
||||
|
||||
<meta property="og:title" content="[ngn.tf] | {title}" />
|
||||
<meta property="og:description" content={desc} />
|
||||
<meta property="og:url" content={app_url()} />
|
||||
|
||||
<link
|
||||
rel="alternate"
|
||||
|
@ -1,14 +1,12 @@
|
||||
<script>
|
||||
import { browser } from "$app/environment";
|
||||
import { color } from "$lib/util.js";
|
||||
import { onMount } from "svelte";
|
||||
import { _ } from "svelte-i18n";
|
||||
|
||||
export let picture = "";
|
||||
export let title = "";
|
||||
|
||||
let title_cur = title;
|
||||
let show_animation = false;
|
||||
let title_cur = "";
|
||||
|
||||
function animate(title) {
|
||||
if (!browser) return;
|
||||
@ -26,21 +24,13 @@
|
||||
}
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
show_animation = true;
|
||||
});
|
||||
|
||||
$: animate(title);
|
||||
</script>
|
||||
|
||||
<header>
|
||||
<div>
|
||||
{#if show_animation}
|
||||
<h1 class="title" style="color: var(--{color()})">{title_cur}</h1>
|
||||
<h1 class="cursor" style="color: var(--{color()})">_</h1>
|
||||
{:else}
|
||||
<h1 class="title" style="color: var(--{color()})">{title}</h1>
|
||||
{/if}
|
||||
<h1 class="title" style="color: var(--{color()})">{title_cur}</h1>
|
||||
<h1 class="cursor" style="color: var(--{color()})">_</h1>
|
||||
</div>
|
||||
<img src="/profile/{picture}.png" alt="" />
|
||||
</header>
|
||||
|
@ -1,9 +1,7 @@
|
||||
<script>
|
||||
import { locale_list, locale_select, locale_index } from "$lib/locale.js";
|
||||
import { onMount } from "svelte";
|
||||
|
||||
let len = locale_list.length;
|
||||
let show = false;
|
||||
|
||||
function get_next(indx) {
|
||||
let new_indx = 0;
|
||||
@ -17,17 +15,11 @@
|
||||
function next() {
|
||||
locale_select(get_next($locale_index).code);
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
show = true;
|
||||
});
|
||||
</script>
|
||||
|
||||
{#if show}
|
||||
<button on:click={next}>
|
||||
{get_next($locale_index).icon}
|
||||
</button>
|
||||
{/if}
|
||||
<button on:click={next}>
|
||||
{get_next($locale_index).icon}
|
||||
</button>
|
||||
|
||||
<style>
|
||||
button {
|
||||
|
@ -1,4 +1,6 @@
|
||||
import { locale_from_browser } from "$lib/locale.js";
|
||||
import { browser } from "$app/environment";
|
||||
import { page } from "$app/state";
|
||||
|
||||
const colors = [
|
||||
"yellow",
|
||||
@ -23,14 +25,34 @@ function click() {
|
||||
audio.play();
|
||||
}
|
||||
|
||||
function urljoin(url, path = null) {
|
||||
function urljoin(url, path = null, query = {}) {
|
||||
if (undefined === url || null === url) return;
|
||||
|
||||
if (url[url.length - 1] != "/") url += "/";
|
||||
let url_len = url.length;
|
||||
|
||||
if (null === path || "" === path) return url;
|
||||
if (path[0] === "/") return url + path.slice(1);
|
||||
return url + path;
|
||||
if (url[url_len - 1] != "/") url += "/";
|
||||
|
||||
if (null === path || "" === path) url = new URL(url);
|
||||
else if (path[0] === "/") url = new URL(path.slice(1), url);
|
||||
else url = new URL(path, url);
|
||||
|
||||
for (let k in query) url.searchParams.append(k, query[k]);
|
||||
|
||||
return url.href;
|
||||
}
|
||||
|
||||
function env_url(prefix) {
|
||||
let host = "";
|
||||
|
||||
if (browser) host = window.location.hostname;
|
||||
|
||||
if (host.endsWith(".onion")) return import.meta.env["WEBSITE_" + prefix + "_URL_ONION"];
|
||||
else if (host.endsWith(".i2p")) return import.meta.env["WEBSITE_" + prefix + "_URL_I2P"];
|
||||
else return import.meta.env["WEBSITE_" + prefix + "_URL_CLEAR"];
|
||||
}
|
||||
|
||||
function app_url(path = null, query = {}) {
|
||||
return urljoin(env_url("APP"), path, query);
|
||||
}
|
||||
|
||||
function time_from_ts(ts) {
|
||||
@ -58,4 +80,4 @@ function date_from_ts(ts) {
|
||||
}).format(new Date(ts * 1000));
|
||||
}
|
||||
|
||||
export { color, click, urljoin, time_from_ts, date_from_ts };
|
||||
export { color, click, urljoin, env_url, app_url, time_from_ts, date_from_ts };
|
||||
|
@ -73,7 +73,6 @@
|
||||
"license": "License",
|
||||
"privacy": "Privacy",
|
||||
"number": "Visited {total} times since {since}",
|
||||
"wow": "wow!!",
|
||||
"js": "Enable javascript to display all the elements"
|
||||
"wow": "wow!!"
|
||||
}
|
||||
}
|
||||
|
@ -73,7 +73,6 @@
|
||||
"license": "Lisans",
|
||||
"privacy": "Gizlilik",
|
||||
"number": "{since} tarihinden beri {total} kez ziyaret edildi",
|
||||
"wow": "vay be!!",
|
||||
"js": "Tüm elementleri görüntelemek için javascript'i açın"
|
||||
"wow": "vay be!!"
|
||||
}
|
||||
}
|
||||
|
@ -7,11 +7,9 @@
|
||||
|
||||
import { api_urljoin } from "$lib/api.js";
|
||||
import { locale, _ } from "svelte-i18n";
|
||||
import { onMount } from "svelte";
|
||||
|
||||
let { data } = $props();
|
||||
let services = $state(data.services);
|
||||
let show_input = $state(false);
|
||||
|
||||
function change(input) {
|
||||
let value = input.target.value.toLowerCase();
|
||||
@ -33,10 +31,6 @@
|
||||
return s.desc[$locale] !== "" && s.desc[$locale] !== null && s.desc[$locale] !== undefined;
|
||||
});
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
show_input = true;
|
||||
});
|
||||
</script>
|
||||
|
||||
<Head title="services" desc="my self-hosted services and projects" />
|
||||
@ -47,9 +41,7 @@
|
||||
{:else}
|
||||
<main>
|
||||
<div class="title">
|
||||
{#if show_input}
|
||||
<input oninput={change} type="text" placeholder={$_("services.search")} />
|
||||
{/if}
|
||||
<input oninput={change} type="text" placeholder={$_("services.search")} />
|
||||
<div>
|
||||
<Link icon="nf-fa-feed" link={api_urljoin("/news/" + $locale)}>{$_("services.feed")}</Link>
|
||||
</div>
|
||||
|
@ -1,3 +1,2 @@
|
||||
User-Agent: *
|
||||
Disallow: /doc/
|
||||
Disallow: /api/
|
||||
|
@ -24,9 +24,15 @@ const default_env = {
|
||||
source_url: "https://git.ngn.tf/ngn/website",
|
||||
report_url: "https://git.ngn.tf/ngn/website/issues",
|
||||
doc_url: "http://localhost:7003",
|
||||
api: {
|
||||
url: "http://localhost:7002",
|
||||
path: "http://localhost:7002",
|
||||
app_url: {
|
||||
clear: "http://localhost:7001",
|
||||
onion: "",
|
||||
i2p: "",
|
||||
},
|
||||
api_url: {
|
||||
clear: "http://localhost:7002",
|
||||
onion: "",
|
||||
i2p: "",
|
||||
},
|
||||
};
|
||||
|
||||
|
BIN
assets/6.0_index.png
Normal file
BIN
assets/6.0_index.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 156 KiB |
BIN
assets/6.0_services.png
Normal file
BIN
assets/6.0_services.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 111 KiB |
@ -5,11 +5,18 @@ services:
|
||||
build:
|
||||
context: ./app
|
||||
args:
|
||||
# app URLs
|
||||
WEBSITE_APP_URL_CLEAR: "http://localhost:7001"
|
||||
WEBSITE_APP_URL_ONION: ""
|
||||
WEBSITE_APP_URL_I2P: ""
|
||||
# API URLs
|
||||
WEBSITE_API_URL_CLEAR: "http://localhost:7002"
|
||||
WEBSITE_API_URL_ONION: ""
|
||||
WEBSITE_API_URL_I2P: ""
|
||||
# other
|
||||
WEBSITE_SOURCE_URL: "http://github.com/ngn13/website"
|
||||
WEBSITE_REPORT_URL: "http://github.com/ngn13/website/issues"
|
||||
WEBSITE_DOC_URL: "http://doc:7003"
|
||||
WEBSITE_API_URL: "http://api:7002"
|
||||
WEBSITE_API_PATH: "http://localhost:7002"
|
||||
security_opt:
|
||||
- "no-new-privileges:true"
|
||||
cap_drop:
|
||||
@ -37,7 +44,7 @@ services:
|
||||
- ./data.db:/api/data.db:rw
|
||||
environment:
|
||||
WEBSITE_DEBUG: "false"
|
||||
WEBSITE_APP_URL: "http://localhost:7001"
|
||||
WEBSITE_APP_URL_CLEAR: "http://localhost:7001/"
|
||||
WEBSITE_PASSWORD: "change_me"
|
||||
WEBSITE_HOST: "0.0.0.0:7002"
|
||||
WEBSITE_IP_HEADER: "X-Real-IP"
|
||||
|
@ -81,7 +81,7 @@ BreakBeforeTernaryOperators: true
|
||||
BreakConstructorInitializers: BeforeColon
|
||||
BreakInheritanceList: BeforeColon
|
||||
BreakStringLiterals: true
|
||||
ColumnLimit: 80
|
||||
ColumnLimit: 120
|
||||
CommentPragmas: '^ IWYU pragma:'
|
||||
CompactNamespaces: false
|
||||
ConstructorInitializerIndentWidth: 4
|
||||
|
@ -1,35 +0,0 @@
|
||||
---
|
||||
# "gnu-zero-variadic-macro-arguments" ignored because we are using GNU99
|
||||
# standart
|
||||
|
||||
# "clang-diagnostic-language-extension-token" is ignored because we need the
|
||||
# asm() extension token
|
||||
|
||||
# "DeprecatedOrUnsafeBufferHandling" ignored because C11 "_s" functions are not
|
||||
# secure either
|
||||
Checks: >-
|
||||
clang-diagnostic-*,
|
||||
-clang-diagnostic-gnu-zero-variadic-macro-arguments,
|
||||
-clang-diagnostic-language-extension-token,
|
||||
clang-analyzer-*,
|
||||
-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
|
||||
portability-*,
|
||||
performance-*,
|
||||
WarningsAsErrors: '*'
|
||||
HeaderFileExtensions:
|
||||
- ''
|
||||
- h
|
||||
- hh
|
||||
- hpp
|
||||
- hxx
|
||||
ImplementationFileExtensions:
|
||||
- c
|
||||
- cc
|
||||
- cpp
|
||||
- cxx
|
||||
HeaderFilterRegex: '.*'
|
||||
ExcludeHeaderFilterRegex: ''
|
||||
FormatStyle: file
|
||||
SystemHeaders: false
|
||||
...
|
||||
|
@ -1,9 +1,9 @@
|
||||
FROM ghcr.io/ngn13/ctorm:1.8.1
|
||||
FROM ghcr.io/ngn13/ctorm:1.7
|
||||
|
||||
WORKDIR /doc
|
||||
|
||||
COPY Makefile ./
|
||||
COPY pages ./pages
|
||||
COPY docs ./docs
|
||||
COPY inc ./inc
|
||||
COPY src ./src
|
||||
|
||||
|
@ -26,13 +26,10 @@ $(DISTDIR)/%.o: src/%.c
|
||||
format:
|
||||
clang-format -i -style=file $(CSRCS) $(HSRCS)
|
||||
|
||||
lint:
|
||||
clang-tidy --warnings-as-errors --config= $(CSRCS) $(HSRCS)
|
||||
|
||||
clean:
|
||||
rm -rf $(DISTDIR)
|
||||
|
||||
run:
|
||||
./doc.elf
|
||||
|
||||
.PHONY: format lint clean run
|
||||
.PHONY: format clean run
|
||||
|
@ -1,9 +1,9 @@
|
||||
My website's API, stores information about my self-hosted services, it also allows me
|
||||
to publish news and updates about these services using an Atom feed and it keeps track
|
||||
of visitor metrics.
|
||||
My website's API, [api.ngn.tf](https://api.ngn.tf), stores information about my
|
||||
self-hosted services, it also allows me to publish news and updates about these
|
||||
services using an Atom feed and it keeps track of visitor metrics. The API itself is
|
||||
written in Go and uses SQLite for storage.
|
||||
|
||||
This documentation contains information about all the available API endpoints. All the
|
||||
endpoints can be accessed using the `/api` route.
|
||||
This documentation contains information about all the available API endpoints.
|
||||
|
||||
## Version 1 Endpoints
|
||||
Each version 1 endpoint, can be accessed using the `/v1` route.
|
@ -1,9 +1,9 @@
|
||||
Websitemin API, self-host edilen servisler hakkında bilgileri tutuyor, bu servisler hakkında
|
||||
haberleri ve güncellemeleri bir Atom feed'i aracılığı ile paylaşmama izin veriyor ve ziyartçi
|
||||
metriklerini takip ediyor.
|
||||
Websitemin API, [api.ngn.tf](https://api.ngn.tf), self-host edilen servisler hakkında bilgileri
|
||||
tutuyor, bu servisler hakkında haberleri ve güncellemeleri bir Atom feed'i aracılığı ile
|
||||
paylaşmama izin veriyor ve ziyartçi metriklerini takip ediyor. API'ın kendisi Go ile yazıldı ve
|
||||
veritabanı olarak SQLite kullanıyor.
|
||||
|
||||
Bu dökümentasyon tüm erişime açık API endpoint'leri hakkında bilgiler içeriyor. Tüm endpoint'lere
|
||||
`/api` yolu ile erişilebilir.
|
||||
Bu dökümentasyon tüm erişeme açık API endpoint'leri hakkında bilgiler içeriyor.
|
||||
|
||||
## Versyion 1 Endpoint'leri
|
||||
Tüm versiyon 1 endpoint'leri `/v1` yolu ile erişilebilir.
|
4
doc/docs/privacy.en.json
Normal file
4
doc/docs/privacy.en.json
Normal file
@ -0,0 +1,4 @@
|
||||
{
|
||||
"title": "privacy",
|
||||
"desc": "Learn how I respect your privacy"
|
||||
}
|
4
doc/docs/privacy.tr.json
Normal file
4
doc/docs/privacy.tr.json
Normal file
@ -0,0 +1,4 @@
|
||||
{
|
||||
"title": "gizlilik",
|
||||
"desc": "Gizliliğinize nasıl önem verdiğimi öğrenin"
|
||||
}
|
@ -3,13 +3,13 @@
|
||||
#include <stdbool.h>
|
||||
#include <dirent.h>
|
||||
|
||||
#include "file.h"
|
||||
#include "util.h"
|
||||
|
||||
typedef struct {
|
||||
DIR *dir;
|
||||
file_t *file;
|
||||
char name[NAME_MAX + 1];
|
||||
char *lang;
|
||||
DIR *dir;
|
||||
util_file_t *file;
|
||||
char name[NAME_MAX + 1];
|
||||
char *lang;
|
||||
} docs_t;
|
||||
|
||||
bool docs_init(docs_t *docs, char *dir);
|
||||
|
@ -1,10 +0,0 @@
|
||||
#pragma once
|
||||
#include <stdint.h>
|
||||
|
||||
typedef struct {
|
||||
char *content;
|
||||
int64_t size;
|
||||
} file_t;
|
||||
|
||||
file_t *file_load(int dirfd, char *path);
|
||||
void file_free(file_t *file);
|
@ -4,8 +4,16 @@
|
||||
#include <stdint.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#define util_toupper(str) \
|
||||
for (char *c = str; *c != 0; c++) \
|
||||
typedef struct {
|
||||
char *content;
|
||||
uint64_t size;
|
||||
} util_file_t;
|
||||
|
||||
#define util_toupper(str) \
|
||||
for (char *c = str; *c != 0; c++) \
|
||||
*c = toupper(*c)
|
||||
uint64_t util_endswith(char *str, char *suf);
|
||||
void util_send(ctorm_res_t *res, uint16_t code, cJSON *json);
|
||||
uint64_t util_endswith(char *str, char *suf);
|
||||
void util_send(ctorm_res_t *res, uint16_t code, cJSON *json);
|
||||
util_file_t *util_file_load(int dirfd, char *path);
|
||||
void util_file_free(util_file_t *file);
|
||||
bool util_parse_doc_name(char *name, char **lang, const char *ext);
|
||||
|
@ -1,4 +0,0 @@
|
||||
{
|
||||
"title": "privacy",
|
||||
"desc": "Privacy policy"
|
||||
}
|
@ -1,4 +0,0 @@
|
||||
{
|
||||
"title": "gizlilik",
|
||||
"desc": "Gizlilik ilkesi"
|
||||
}
|
@ -11,25 +11,22 @@
|
||||
|
||||
option_t options[] = {
|
||||
// name value requied
|
||||
{"host", "0.0.0.0:7003", true }, // host the server should listen on
|
||||
{"dir", "./pages", true }, // documentation pages directory
|
||||
{"", NULL, false},
|
||||
{"host", "0.0.0.0:7003", true }, // host the server should listen on
|
||||
{"docs_dir", "./docs", true }, // documentation directory
|
||||
{"", NULL, false},
|
||||
};
|
||||
|
||||
bool config_load(config_t *conf) {
|
||||
memset(conf, 0, sizeof(*conf));
|
||||
bzero(conf, sizeof(*conf));
|
||||
|
||||
char name_env[OPT_NAME_MAX + 10], name_copy[OPT_NAME_MAX], *value = NULL;
|
||||
conf->options = options;
|
||||
|
||||
for (option_t *opt = conf->options; opt->value != NULL;
|
||||
opt++, conf->count++) {
|
||||
// convert option name to environment variable name
|
||||
strncpy(name_copy, opt->name, OPT_NAME_MAX);
|
||||
for (option_t *opt = conf->options; opt->value != NULL; opt++, conf->count++) {
|
||||
strcpy(name_copy, opt->name);
|
||||
util_toupper(name_copy);
|
||||
snprintf(name_env, sizeof(name_env), "WEBSITE_%s", name_copy);
|
||||
|
||||
// attempt to load the value from the environment
|
||||
if ((value = getenv(name_env)) != NULL)
|
||||
opt->value = value;
|
||||
|
||||
@ -39,9 +36,7 @@ bool config_load(config_t *conf) {
|
||||
if (!opt->required || NULL != opt->value)
|
||||
continue;
|
||||
|
||||
ctorm_fail("please specify a value for the required config option: %s (%s)",
|
||||
opt->name,
|
||||
name_env);
|
||||
ctorm_fail("please specify a value for the required config option: %s (%s)", opt->name, name_env);
|
||||
errno = EFAULT;
|
||||
return false;
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include <linux/limits.h>
|
||||
|
||||
#include <dirent.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdint.h>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
#define DOCS_LANG_CODE_LEN 2
|
||||
|
||||
bool _docs_parse_name(docs_t *docs, char *ext) {
|
||||
bool __docs_parse_name(docs_t *docs, char *ext) {
|
||||
// check the extension
|
||||
uint64_t ext_pos = util_endswith(docs->name, ext);
|
||||
|
||||
@ -22,8 +22,7 @@ bool _docs_parse_name(docs_t *docs, char *ext) {
|
||||
// example.en\0json\0
|
||||
// |
|
||||
// `--- find this
|
||||
for (docs->lang = docs->name; *docs->lang != 0 && *docs->lang != '.';
|
||||
docs->lang++)
|
||||
for (docs->lang = docs->name; *docs->lang != 0 && *docs->lang != '.'; docs->lang++)
|
||||
continue;
|
||||
|
||||
if (*docs->lang != '.')
|
||||
@ -40,11 +39,11 @@ bool _docs_parse_name(docs_t *docs, char *ext) {
|
||||
return strlen(docs->lang) == DOCS_LANG_CODE_LEN && *docs->name != 0;
|
||||
}
|
||||
|
||||
void _docs_clean(docs_t *docs) {
|
||||
void __docs_clean(docs_t *docs) {
|
||||
if (NULL == docs->file)
|
||||
return;
|
||||
|
||||
file_free(docs->file);
|
||||
util_file_free(docs->file);
|
||||
docs->file = NULL;
|
||||
}
|
||||
|
||||
@ -54,7 +53,7 @@ bool docs_init(docs_t *docs, char *dir) {
|
||||
return false;
|
||||
}
|
||||
|
||||
memset(docs, 0, sizeof(*docs));
|
||||
bzero(docs, sizeof(*docs));
|
||||
return NULL != (docs->dir = opendir(dir));
|
||||
}
|
||||
|
||||
@ -65,15 +64,15 @@ char *docs_next(docs_t *docs, char *name, bool content) {
|
||||
}
|
||||
|
||||
struct dirent *ent = NULL;
|
||||
_docs_clean(docs);
|
||||
__docs_clean(docs);
|
||||
|
||||
while (NULL != (ent = readdir(docs->dir))) {
|
||||
if (*ent->d_name == '.')
|
||||
continue;
|
||||
|
||||
strncpy(docs->name, ent->d_name, NAME_MAX);
|
||||
strcpy(docs->name, ent->d_name);
|
||||
|
||||
if (!_docs_parse_name(docs, content ? ".md" : ".json"))
|
||||
if (!__docs_parse_name(docs, content ? ".md" : ".json"))
|
||||
continue;
|
||||
|
||||
if (NULL == name || strncmp(docs->name, name, NAME_MAX) == 0)
|
||||
@ -85,7 +84,7 @@ char *docs_next(docs_t *docs, char *name, bool content) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (NULL == (docs->file = file_load(dirfd(docs->dir), ent->d_name)))
|
||||
if (NULL == (docs->file = util_file_load(dirfd(docs->dir), ent->d_name)))
|
||||
return NULL;
|
||||
|
||||
return docs->file->content;
|
||||
@ -100,8 +99,8 @@ void docs_free(docs_t *docs) {
|
||||
if (NULL == docs)
|
||||
return;
|
||||
|
||||
_docs_clean(docs);
|
||||
__docs_clean(docs);
|
||||
closedir(docs->dir);
|
||||
|
||||
memset(docs, 0, sizeof(*docs));
|
||||
bzero(docs, sizeof(*docs));
|
||||
}
|
||||
|
@ -1,56 +0,0 @@
|
||||
#include <sys/mman.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "file.h"
|
||||
|
||||
file_t *file_load(int dirfd, char *path) {
|
||||
if (NULL == path) {
|
||||
errno = EINVAL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
file_t *file = NULL;
|
||||
int fd = -1;
|
||||
|
||||
// open the taarget file
|
||||
if ((fd = openat(dirfd, path, O_RDONLY)) < 0)
|
||||
goto end; // errno set by open
|
||||
|
||||
// allocate a new file structure
|
||||
if (NULL == (file = calloc(1, sizeof(file_t))))
|
||||
goto end; // errno set by malloc
|
||||
|
||||
// calculate the file size
|
||||
if ((file->size = lseek(fd, 0, SEEK_END)) < 0)
|
||||
goto end;
|
||||
|
||||
// memory map the file
|
||||
if (NULL ==
|
||||
(file->content = mmap(0, file->size, PROT_READ, MAP_PRIVATE, fd, 0)))
|
||||
goto end; // errno set by mmap
|
||||
|
||||
end:
|
||||
if (fd != -1)
|
||||
close(fd);
|
||||
|
||||
if (NULL != file && NULL == file->content) {
|
||||
free(file);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return file;
|
||||
}
|
||||
|
||||
void file_free(file_t *file) {
|
||||
if (NULL == file)
|
||||
return;
|
||||
|
||||
munmap(file->content, file->size);
|
||||
free(file);
|
||||
}
|
@ -1,4 +1,3 @@
|
||||
#include <ctorm/app.h>
|
||||
#include <ctorm/ctorm.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
@ -20,28 +19,25 @@ int main() {
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
// initialize the app config
|
||||
ctorm_config_new(&app_config);
|
||||
app_config.disable_logging = true;
|
||||
|
||||
// create a new app
|
||||
app = ctorm_app_new(&app_config);
|
||||
app = ctorm_app_new(&app_config);
|
||||
|
||||
// middlewares
|
||||
ALL(app, "/*", route_cors);
|
||||
ALL(app, "/*/*", route_cors);
|
||||
MIDDLEWARE_ALL(app, "/*", route_cors);
|
||||
MIDDLEWARE_ALL(app, "/*/*", route_cors);
|
||||
|
||||
// routes
|
||||
GET(app, "/list", route_list);
|
||||
GET(app, "/get/:name", route_get);
|
||||
|
||||
ctorm_app_default(app, route_notfound);
|
||||
ctorm_app_all(app, route_notfound);
|
||||
ctorm_app_local(app, "config", &conf);
|
||||
|
||||
ctorm_info("starting the web server on %s", host);
|
||||
|
||||
if (!ctorm_app_run(app, host))
|
||||
ctorm_fail("failed to start the app: %s", ctorm_error());
|
||||
ctorm_fail("failed to start the app: %s", ctorm_geterror());
|
||||
|
||||
ctorm_app_free(app);
|
||||
return EXIT_SUCCESS;
|
||||
|
@ -3,8 +3,7 @@
|
||||
void route_cors(ctorm_req_t *req, ctorm_res_t *res) {
|
||||
RES_SET("Access-Control-Allow-Origin", "*");
|
||||
RES_SET("Access-Control-Allow-Headers",
|
||||
"Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, "
|
||||
"Authorization, accept, origin, Cache-Control, "
|
||||
"Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, "
|
||||
"X-Requested-With");
|
||||
RES_SET("Access-Control-Allow-Methods", "PUT, DELETE, GET");
|
||||
}
|
||||
|
@ -1,30 +1,31 @@
|
||||
#include <linux/limits.h>
|
||||
#include <cjson/cJSON.h>
|
||||
#include <dirent.h>
|
||||
#include <linux/limits.h>
|
||||
#include <ctorm/ctorm.h>
|
||||
|
||||
#include <dirent.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "routes.h"
|
||||
#include "config.h"
|
||||
#include "util.h"
|
||||
#include "docs.h"
|
||||
|
||||
void route_get(ctorm_req_t *req, ctorm_res_t *res) {
|
||||
config_t *conf = REQ_LOCAL("config");
|
||||
char *name = REQ_PARAM("name");
|
||||
char *dir = config_get(conf, "dir"), *doc_data = NULL;
|
||||
config_t *conf = REQ_LOCAL("config");
|
||||
char *doc_name = REQ_PARAM("name");
|
||||
char *docs_dir = config_get(conf, "docs_dir"), *doc_data = NULL;
|
||||
cJSON *json = NULL, *doc_json = NULL;
|
||||
docs_t docs;
|
||||
|
||||
if (NULL == name) {
|
||||
if (NULL == doc_name) {
|
||||
ctorm_fail("documentation name not specified (how did that even happend)");
|
||||
util_send(res, 500, NULL);
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (!docs_init(&docs, dir)) {
|
||||
ctorm_fail("docs_init failed: %s", ctorm_error());
|
||||
if (!docs_init(&docs, docs_dir)) {
|
||||
ctorm_fail("docs_init failed: %s", ctorm_geterror());
|
||||
util_send(res, 500, NULL);
|
||||
goto end;
|
||||
}
|
||||
@ -35,7 +36,7 @@ void route_get(ctorm_req_t *req, ctorm_res_t *res) {
|
||||
goto end;
|
||||
}
|
||||
|
||||
while (NULL != (doc_data = docs_next(&docs, name, false))) {
|
||||
while (NULL != (doc_data = docs_next(&docs, doc_name, false))) {
|
||||
if (NULL == (doc_json = cJSON_Parse(doc_data))) {
|
||||
ctorm_fail("failed to parse JSON: %s (%s)", docs.name, docs.lang);
|
||||
continue;
|
||||
@ -52,7 +53,7 @@ void route_get(ctorm_req_t *req, ctorm_res_t *res) {
|
||||
|
||||
docs_reset(&docs);
|
||||
|
||||
while (NULL != (doc_data = docs_next(&docs, name, true))) {
|
||||
while (NULL != (doc_data = docs_next(&docs, doc_name, true))) {
|
||||
if (NULL == (doc_json = cJSON_GetObjectItem(json, docs.lang)))
|
||||
continue;
|
||||
|
||||
|
@ -3,21 +3,21 @@
|
||||
#include <ctorm/ctorm.h>
|
||||
|
||||
#include <dirent.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "routes.h"
|
||||
#include "config.h"
|
||||
#include "util.h"
|
||||
#include "docs.h"
|
||||
|
||||
void route_list(ctorm_req_t *req, ctorm_res_t *res) {
|
||||
config_t *conf = REQ_LOCAL("config");
|
||||
char *dir = config_get(conf, "dir"), *doc_data = NULL;
|
||||
config_t *conf = REQ_LOCAL("config");
|
||||
char *docs_dir = config_get(conf, "docs_dir"), *doc_data = NULL;
|
||||
cJSON *array = NULL, *json = NULL, *doc_json = NULL;
|
||||
docs_t docs;
|
||||
|
||||
if (!docs_init(&docs, dir)) {
|
||||
ctorm_fail("docs_init failed: %s", ctorm_error());
|
||||
if (!docs_init(&docs, docs_dir)) {
|
||||
ctorm_fail("docs_init failed: %s", ctorm_geterror());
|
||||
util_send(res, 500, NULL);
|
||||
goto end;
|
||||
}
|
||||
@ -31,8 +31,7 @@ void route_list(ctorm_req_t *req, ctorm_res_t *res) {
|
||||
while (NULL != (doc_data = docs_next(&docs, NULL, false))) {
|
||||
if (NULL == (array = cJSON_GetObjectItem(json, docs.lang)) &&
|
||||
NULL == (array = cJSON_AddArrayToObject(json, docs.lang))) {
|
||||
ctorm_fail(
|
||||
"failed to create an array object for the language %s", docs.lang);
|
||||
ctorm_fail("failed to create an array object for the language %s", docs.lang);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -1,8 +1,17 @@
|
||||
#include <linux/limits.h>
|
||||
#include <ctorm/ctorm.h>
|
||||
|
||||
#include <sys/mman.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include <stdint.h>
|
||||
#include <dirent.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "util.h"
|
||||
@ -48,3 +57,45 @@ void util_send(ctorm_res_t *res, uint16_t code, cJSON *json) {
|
||||
|
||||
RES_JSON(json);
|
||||
}
|
||||
|
||||
util_file_t *util_file_load(int dirfd, char *path) {
|
||||
if (NULL == path) {
|
||||
errno = EINVAL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
util_file_t *file = NULL;
|
||||
struct stat buf;
|
||||
int fd = -1;
|
||||
|
||||
if (NULL == (file = malloc(sizeof(util_file_t))))
|
||||
goto end; // errno set by malloc
|
||||
|
||||
if ((fd = openat(dirfd, path, O_RDONLY)) < 0)
|
||||
goto end; // errno set by open
|
||||
|
||||
if (fstat(fd, &buf) < 0)
|
||||
goto end; // errno set by fstat
|
||||
|
||||
if (NULL == (file->content = mmap(0, (file->size = buf.st_size), PROT_READ, MAP_PRIVATE, fd, 0)))
|
||||
goto end; // errno set by mmap
|
||||
|
||||
end:
|
||||
if (fd != -1)
|
||||
close(fd);
|
||||
|
||||
if (NULL == file->content) {
|
||||
free(file);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return file;
|
||||
}
|
||||
|
||||
void util_file_free(util_file_t *file) {
|
||||
if (NULL == file)
|
||||
return;
|
||||
|
||||
munmap(file->content, file->size);
|
||||
free(file);
|
||||
}
|
||||
|
Reference in New Issue
Block a user