diff --git a/go.mod b/go.mod index dba5e0e..81293e2 100644 --- a/go.mod +++ b/go.mod @@ -10,17 +10,16 @@ replace ( require ( fornaxian.tech/config v0.0.0-20211108212237-6133aed90586 fornaxian.tech/log v0.0.0-20211102185326-552e9b1f8640 - fornaxian.tech/pixeldrain_api_client v0.0.0-20250718232230-4672a08047c1 - fornaxian.tech/util v0.0.0-20250313124813-fd980f174f1d + fornaxian.tech/pixeldrain_api_client v0.0.0-20260124133150-a94861b84e11 + fornaxian.tech/util v0.0.0-20260123171803-02d15be63d16 github.com/julienschmidt/httprouter v1.3.0 github.com/russross/blackfriday/v2 v2.1.0 ) require ( - github.com/BurntSushi/toml v1.5.0 // indirect - github.com/gocql/gocql v1.7.0 // indirect + github.com/BurntSushi/toml v1.6.0 // indirect + github.com/apache/cassandra-gocql-driver/v2 v2.1.1 // indirect github.com/golang/snappy v1.0.0 // indirect - github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect - golang.org/x/crypto v0.42.0 // indirect + golang.org/x/crypto v0.51.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect ) diff --git a/go.sum b/go.sum index 1fda1c2..ae382c4 100644 --- a/go.sum +++ b/go.sum @@ -2,35 +2,39 @@ fornaxian.tech/config v0.0.0-20211108212237-6133aed90586 h1:/4a0Iq3cYeyTWcPHsN9p fornaxian.tech/config v0.0.0-20211108212237-6133aed90586/go.mod h1:ULIXF4J1DbBw4EsIPRNQDf6J3hl4P/jlihjy6UCm9FM= fornaxian.tech/log v0.0.0-20211102185326-552e9b1f8640 h1:UPDxJwLRCfh/cv80UMSanzmZ0jIcfS1mcd0Y06HYuLw= fornaxian.tech/log v0.0.0-20211102185326-552e9b1f8640/go.mod h1:sN82qMToeHhP2u3ehvrcE8y1IudRZJAZO9yG5OBYblo= -github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= -github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= -github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY= -github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gocql/gocql v1.7.0 h1:O+7U7/1gSN7QTEAaMEsJc1Oq2QHXvCWoF3DFK9HDHus= -github.com/gocql/gocql v1.7.0/go.mod h1:vnlvXyFZeLBF0Wy+RS8hrOdbn0UWsWtdg07XJnFxZ+4= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk= +github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/apache/cassandra-gocql-driver/v2 v2.1.1 h1:DjmtmSRoUuIFswczA8LPBppRb8T9vxqNP5Txc/lQxhE= +github.com/apache/cassandra-gocql-driver/v2 v2.1.1/go.mod h1:QH/asJjB3mHvY6Dot6ZKMMpTcOrWJ8i9GhsvG1g0PK4= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs= github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= -github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/pierrec/lz4/v4 v4.1.8 h1:ieHkV+i2BRzngO4Wd/3HGowuZStgq6QkPsD1eolNAO4= +github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY= +github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= -golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= -golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= -golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= +go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= +golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ= +golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/res/static/img/header.webp b/res/static/img/header.webp index c0eda4f..0b433b8 100644 Binary files a/res/static/img/header.webp and b/res/static/img/header.webp differ diff --git a/res/static/img/header.xcf b/res/static/img/header.xcf index 2cbb204..7ce4c3e 100644 Binary files a/res/static/img/header.xcf and b/res/static/img/header.xcf differ diff --git a/res/static/img/nova2.xcf b/res/static/img/nova2.xcf new file mode 100644 index 0000000..95ea74d Binary files /dev/null and b/res/static/img/nova2.xcf differ diff --git a/res/static/img/nova_128.png b/res/static/img/nova_128.png index 4438b39..372b4ee 100644 Binary files a/res/static/img/nova_128.png and b/res/static/img/nova_128.png differ diff --git a/res/static/img/nova_256.png b/res/static/img/nova_256.png index 58edcb8..5cad2bc 100644 Binary files a/res/static/img/nova_256.png and b/res/static/img/nova_256.png differ diff --git a/res/static/img/nova_32.png b/res/static/img/nova_32.png index 8eac89f..9d835a9 100644 Binary files a/res/static/img/nova_32.png and b/res/static/img/nova_32.png differ diff --git a/res/static/img/nova_512.png b/res/static/img/nova_512.png index 46ac27b..60662bd 100644 Binary files a/res/static/img/nova_512.png and b/res/static/img/nova_512.png differ diff --git a/res/static/img/nova_64.png b/res/static/img/nova_64.png index b6ed533..87616f4 100644 Binary files a/res/static/img/nova_64.png and b/res/static/img/nova_64.png differ diff --git a/svelte/src/filesystem/edit_window/Branding.ts b/svelte/src/filesystem/edit_window/Branding.ts index a230c59..dab794e 100644 --- a/svelte/src/filesystem/edit_window/Branding.ts +++ b/svelte/src/filesystem/edit_window/Branding.ts @@ -4,7 +4,7 @@ import hsl2rgb from "pure-color/convert/hsl2rgb"; import rgb2hex from "pure-color/convert/rgb2hex"; import type { FSNode, FSNodeProperties } from "lib/FilesystemAPI.svelte"; -const text_contrast = 80 +const text_contrast = 85 const body_alpha = 0.9 type Style = { diff --git a/svelte/tsconfig.json b/svelte/tsconfig.json index 78861e7..9f6686d 100644 --- a/svelte/tsconfig.json +++ b/svelte/tsconfig.json @@ -4,12 +4,17 @@ "es2017", "dom" ], - "baseUrl": "./src", + "paths": { + "*": [ + "./src/*" + ] + }, "verbatimModuleSyntax": true, "target": "ES2017", "noUnusedLocals": true, "module": "preserve", - "moduleResolution": "bundler" + "moduleResolution": "bundler", + "strict": false, }, "include": [ "src/" diff --git a/webcontroller/opengraph.go b/webcontroller/opengraph.go index 1588b1f..4615a77 100644 --- a/webcontroller/opengraph.go +++ b/webcontroller/opengraph.go @@ -9,7 +9,7 @@ import ( ) const defaultThemeColour = "#220735" -const defaultHost = "https://pixeldrain.com" +const defaultHost = "https://nova.storage" type ogData struct { MetaPropRules []ogProp @@ -28,15 +28,15 @@ func (og *ogData) addLink(k, v string) { og.LinkRules = append(og.LinkRules, ogP func generateOGData(name, filetype, pageurl, fileurl, thumbnailurl, themecolour string) (og ogData) { og.addProp("og:title", name) - og.addProp("og:site_name", "pixeldrain") - og.addProp("og:description", "This file has been shared with you on pixeldrain") + og.addProp("og:site_name", "Nova.storage") + og.addProp("og:description", "This file has been shared with you on Nova") og.addProp("og:url", pageurl) - og.addProp("description", "This file has been shared with you on pixeldrain") - og.addName("description", "This file has been shared with you on pixeldrain") - og.addName("keywords", "pixeldrain,shared,sharing,upload,file,free") + og.addProp("description", "This file has been shared with you on Nova") + og.addName("description", "This file has been shared with you on Nova") + og.addName("keywords", "shared,sharing,upload,file") og.addName("twitter:title", name) og.addName("twitter:site", "@Fornax96") - og.addName("twitter:domain", "pixeldrain.com") + og.addName("twitter:domain", "nova.storage") og.addName("theme-color", themecolour) if strings.HasPrefix(filetype, "image") { diff --git a/webcontroller/style.go b/webcontroller/style.go index b1ce8f7..c8ad207 100644 --- a/webcontroller/style.go +++ b/webcontroller/style.go @@ -48,6 +48,8 @@ func userStyle(style string, hue int) template.CSS { switch style { default: fallthrough + case "nova": + def = novaStyle case "adwaita": def = adwaitaDarkStyle light = adwaitaLightStyle @@ -323,6 +325,21 @@ var classicStyle = styleSheet{ CardColor: HSL{0, 0, .16}, } +var novaStyle = styleSheet{ + Input: HSL{94, 1, .1}, + InputHover: HSL{94, 1, .15}, + InputText: HSL{0, 0, .9}, + InputDisabledText: HSL{0, 0, .4}, + Highlight: HSL{94, .70, .45}, + HighlightText: HSL{0, 0, 0}, + Danger: HSL{339, .65, .31}, + + BackgroundColor: HSL{94, 1, .02}, + BodyColor: HSL{94, 1, .04}, + BodyText: HSL{94, 1, .9}, + CardColor: HSL{94, 1, .06}, +} + var maroonStyle = styleSheet{ Input: HSL{0, .8, .20}, // hsl(0, 87%, 40%) InputHover: HSL{0, .8, .25},