From a0732a4593edc92f3c5b056619edd5383aaacd33 Mon Sep 17 00:00:00 2001 From: cupcakearmy Date: Sun, 2 Jan 2022 23:46:08 +0100 Subject: [PATCH] move folder --- .dockerignore | 4 +- .gitignore | 2 +- CHANGELOG.md | 7 ++ Dockerfile | 14 +-- Cargo.lock => backend/Cargo.lock | 98 +++++++++--------- Cargo.toml => backend/Cargo.toml | 4 +- {src => backend/src}/client.rs | 4 +- {src => backend/src}/main.rs | 0 {src => backend/src}/note/mod.rs | 0 {src => backend/src}/note/model.rs | 0 {src => backend/src}/note/routes.rs | 0 {src => backend/src}/size.rs | 0 {src => backend/src}/store.rs | 0 {client => frontend}/.dockerignore | 0 {client => frontend}/.gitignore | 0 {client => frontend}/.npmrc | 0 {client => frontend}/.prettierignore | 0 {client => frontend}/.prettierrc | 0 {client => frontend}/README.md | 0 {client => frontend}/licenses.csv | 0 {client => frontend}/package.json | 0 {client => frontend}/pnpm-lock.yaml | 0 {client => frontend}/src/app.css | 0 {client => frontend}/src/app.html | 0 {client => frontend}/src/global.d.ts | 0 {client => frontend}/src/lib/api.ts | 0 {client => frontend}/src/lib/crypto.ts | 0 {client => frontend}/src/lib/files.ts | 0 {client => frontend}/src/lib/stores/status.ts | 0 .../src/lib/ui/AboutParagraph.svelte | 0 {client => frontend}/src/lib/ui/Button.svelte | 0 .../src/lib/ui/FileUpload.svelte | 0 {client => frontend}/src/lib/ui/Icon.svelte | 0 .../src/lib/ui/MaxSize.svelte | 0 .../src/lib/ui/ShowNote.svelte | 0 {client => frontend}/src/lib/ui/Switch.svelte | 0 .../src/lib/ui/TextArea.svelte | 0 .../src/lib/ui/TextInput.svelte | 0 .../src/lib/ui/ThemeToggle.svelte | 0 .../src/lib/views/Create.svelte | 0 .../src/lib/views/Footer.svelte | 0 .../src/lib/views/Header.svelte | 0 .../src/routes/__layout.svelte | 0 {client => frontend}/src/routes/about.svelte | 0 {client => frontend}/src/routes/index.svelte | 0 .../src/routes/note/[id].svelte | 0 {client => frontend}/static/favicon.png | Bin .../static/icons/contrast-sharp.svg | 0 .../static/icons/copy-sharp.svg | 0 .../static/icons/dice-sharp.svg | 0 .../static/icons/eye-off-sharp.svg | 0 .../static/icons/eye-sharp.svg | 0 .../static/icons/lock-closed-sharp.svg | 0 {client => frontend}/static/robots.txt | 0 {client => frontend}/svelte.config.js | 0 {client => frontend}/tsconfig.json | 0 package.json | 8 +- pnpm-lock.yaml | 15 --- 58 files changed, 73 insertions(+), 83 deletions(-) rename Cargo.lock => backend/Cargo.lock (96%) rename Cargo.toml => backend/Cargo.toml (92%) rename {src => backend/src}/client.rs (56%) rename {src => backend/src}/main.rs (100%) rename {src => backend/src}/note/mod.rs (100%) rename {src => backend/src}/note/model.rs (100%) rename {src => backend/src}/note/routes.rs (100%) rename {src => backend/src}/size.rs (100%) rename {src => backend/src}/store.rs (100%) rename {client => frontend}/.dockerignore (100%) rename {client => frontend}/.gitignore (100%) rename {client => frontend}/.npmrc (100%) rename {client => frontend}/.prettierignore (100%) rename {client => frontend}/.prettierrc (100%) rename {client => frontend}/README.md (100%) rename {client => frontend}/licenses.csv (100%) rename {client => frontend}/package.json (100%) rename {client => frontend}/pnpm-lock.yaml (100%) rename {client => frontend}/src/app.css (100%) rename {client => frontend}/src/app.html (100%) rename {client => frontend}/src/global.d.ts (100%) rename {client => frontend}/src/lib/api.ts (100%) rename {client => frontend}/src/lib/crypto.ts (100%) rename {client => frontend}/src/lib/files.ts (100%) rename {client => frontend}/src/lib/stores/status.ts (100%) rename {client => frontend}/src/lib/ui/AboutParagraph.svelte (100%) rename {client => frontend}/src/lib/ui/Button.svelte (100%) rename {client => frontend}/src/lib/ui/FileUpload.svelte (100%) rename {client => frontend}/src/lib/ui/Icon.svelte (100%) rename {client => frontend}/src/lib/ui/MaxSize.svelte (100%) rename {client => frontend}/src/lib/ui/ShowNote.svelte (100%) rename {client => frontend}/src/lib/ui/Switch.svelte (100%) rename {client => frontend}/src/lib/ui/TextArea.svelte (100%) rename {client => frontend}/src/lib/ui/TextInput.svelte (100%) rename {client => frontend}/src/lib/ui/ThemeToggle.svelte (100%) rename {client => frontend}/src/lib/views/Create.svelte (100%) rename {client => frontend}/src/lib/views/Footer.svelte (100%) rename {client => frontend}/src/lib/views/Header.svelte (100%) rename {client => frontend}/src/routes/__layout.svelte (100%) rename {client => frontend}/src/routes/about.svelte (100%) rename {client => frontend}/src/routes/index.svelte (100%) rename {client => frontend}/src/routes/note/[id].svelte (100%) rename {client => frontend}/static/favicon.png (100%) rename {client => frontend}/static/icons/contrast-sharp.svg (100%) rename {client => frontend}/static/icons/copy-sharp.svg (100%) rename {client => frontend}/static/icons/dice-sharp.svg (100%) rename {client => frontend}/static/icons/eye-off-sharp.svg (100%) rename {client => frontend}/static/icons/eye-sharp.svg (100%) rename {client => frontend}/static/icons/lock-closed-sharp.svg (100%) rename {client => frontend}/static/robots.txt (100%) rename {client => frontend}/svelte.config.js (100%) rename {client => frontend}/tsconfig.json (100%) diff --git a/.dockerignore b/.dockerignore index 5feb907..84e364f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,2 @@ -target -node_modules \ No newline at end of file +/**/target +/**/node_modules diff --git a/.gitignore b/.gitignore index 5746745..3f28053 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Backend -/target +target # Client .DS_Store diff --git a/CHANGELOG.md b/CHANGELOG.md index 14b4483..8c6bc49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.3.2] - 2022-01-02 + +### Changed + +- Dependencies updates. +- Folder structure. + ## [1.3.1] - 2021-12-30 ### Added diff --git a/Dockerfile b/Dockerfile index 6b77d92..936761c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,26 +1,28 @@ +# Client FROM node:16-alpine as CLIENT WORKDIR /tmp -COPY ./client ./ +COPY ./frontend ./ RUN npm install -g pnpm RUN pnpm install RUN pnpm run build -FROM rust:1.51-alpine as RUST +# Rust +FROM rust:1.56-alpine as RUST WORKDIR /tmp RUN apk add libc-dev openssl-dev alpine-sdk -COPY ./Cargo* ./ -COPY ./src ./src +COPY ./backend ./ RUN cargo build --release -FROM scratch +# Server +FROM alpine WORKDIR /app COPY --from=RUST /tmp/target/release/cryptgeon . -COPY --from=CLIENT /tmp/build ./client/build +COPY --from=CLIENT /tmp/build ./frontend/build ENV MEMCACHE=memcached:11211 diff --git a/Cargo.lock b/backend/Cargo.lock similarity index 96% rename from Cargo.lock rename to backend/Cargo.lock index f6101c5..2c02ecc 100644 --- a/Cargo.lock +++ b/backend/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project 0.4.28", + "pin-project 0.4.29", "tokio", "tokio-util", ] @@ -93,7 +93,7 @@ dependencies = [ "log", "mime", "percent-encoding", - "pin-project 1.0.8", + "pin-project 1.0.10", "rand 0.7.3", "regex", "serde", @@ -169,7 +169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" dependencies = [ "futures-util", - "pin-project 0.4.28", + "pin-project 0.4.29", ] [[package]] @@ -229,7 +229,7 @@ dependencies = [ "futures-sink", "futures-util", "log", - "pin-project 0.4.28", + "pin-project 0.4.29", "slab", ] @@ -261,7 +261,7 @@ dependencies = [ "fxhash", "log", "mime", - "pin-project 1.0.8", + "pin-project 1.0.10", "regex", "serde", "serde_json", @@ -486,7 +486,7 @@ checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" dependencies = [ "percent-encoding", "time", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -515,7 +515,7 @@ dependencies = [ [[package]] name = "cryptgeon" -version = "1.3.0" +version = "1.3.2" dependencies = [ "actix-files", "actix-web", @@ -734,7 +734,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "pin-utils", "slab", ] @@ -755,7 +755,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" dependencies = [ "typenum", - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -837,13 +837,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ "bytes 1.1.0", "fnv", - "itoa 0.4.8", + "itoa 1.0.1", ] [[package]] @@ -1138,9 +1138,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", @@ -1218,27 +1218,27 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pin-project" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" +checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" dependencies = [ - "pin-project-internal 0.4.28", + "pin-project-internal 0.4.29", ] [[package]] name = "pin-project" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ - "pin-project-internal 1.0.8", + "pin-project-internal 1.0.10", ] [[package]] name = "pin-project-internal" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" +checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" dependencies = [ "proc-macro2", "quote", @@ -1247,9 +1247,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", @@ -1264,9 +1264,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" [[package]] name = "pin-utils" @@ -1282,9 +1282,9 @@ checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" [[package]] name = "ppv-lite86" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "proc-macro-hack" @@ -1294,9 +1294,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.34" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ "unicode-xid", ] @@ -1309,9 +1309,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.10" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" dependencies = [ "proc-macro2", ] @@ -1521,18 +1521,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9875c23cf305cd1fd7eb77234cbb705f21ea6a72c637a5c6db5fe4b8e7f008" +checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc0db5cb2556c0e558887d9bbdcf6ac4471e83ff66cf696e5419024d1606276" +checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" dependencies = [ "proc-macro2", "quote", @@ -1541,9 +1541,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5" +checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" dependencies = [ "itoa 1.0.1", "ryu", @@ -1625,7 +1625,7 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" dependencies = [ - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -1679,9 +1679,9 @@ checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" [[package]] name = "syn" -version = "1.0.82" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" +checksum = "ecb2e6da8ee5eb9a61068762a32fa9619cc591ceb055b3687f4cd4051ec2e06b" dependencies = [ "proc-macro2", "quote", @@ -1728,7 +1728,7 @@ dependencies = [ "standback", "stdweb", "time-macros", - "version_check 0.9.3", + "version_check 0.9.4", "winapi 0.3.9", ] @@ -1812,7 +1812,7 @@ checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ "cfg-if 1.0.0", "log", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "tracing-core", ] @@ -1831,7 +1831,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.8", + "pin-project 1.0.10", "tracing", ] @@ -1876,9 +1876,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "unicase" @@ -1886,7 +1886,7 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ - "version_check 0.9.3", + "version_check 0.9.4", ] [[package]] @@ -1986,9 +1986,9 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasi" diff --git a/Cargo.toml b/backend/Cargo.toml similarity index 92% rename from Cargo.toml rename to backend/Cargo.toml index 972354b..0cfde7b 100644 --- a/Cargo.toml +++ b/backend/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "cryptgeon" -version = "1.3.0" +version = "1.3.2" authors = ["cupcakearmy "] -edition = "2018" +edition = "2021" [[bin]] name = "cryptgeon" diff --git a/src/client.rs b/backend/src/client.rs similarity index 56% rename from src/client.rs rename to backend/src/client.rs index 796da37..f3798a2 100644 --- a/src/client.rs +++ b/backend/src/client.rs @@ -2,9 +2,9 @@ use actix_files::{Files, NamedFile}; use actix_web::{web, Responder}; pub fn init(cfg: &mut web::ServiceConfig) { - cfg.service(Files::new("/", "./client/build").index_file("index.html")); + cfg.service(Files::new("/", "./frontend/build").index_file("index.html")); } pub async fn fallback_fn() -> impl Responder { - NamedFile::open("./client/build/index.html") + NamedFile::open("./frontend/build/index.html") } diff --git a/src/main.rs b/backend/src/main.rs similarity index 100% rename from src/main.rs rename to backend/src/main.rs diff --git a/src/note/mod.rs b/backend/src/note/mod.rs similarity index 100% rename from src/note/mod.rs rename to backend/src/note/mod.rs diff --git a/src/note/model.rs b/backend/src/note/model.rs similarity index 100% rename from src/note/model.rs rename to backend/src/note/model.rs diff --git a/src/note/routes.rs b/backend/src/note/routes.rs similarity index 100% rename from src/note/routes.rs rename to backend/src/note/routes.rs diff --git a/src/size.rs b/backend/src/size.rs similarity index 100% rename from src/size.rs rename to backend/src/size.rs diff --git a/src/store.rs b/backend/src/store.rs similarity index 100% rename from src/store.rs rename to backend/src/store.rs diff --git a/client/.dockerignore b/frontend/.dockerignore similarity index 100% rename from client/.dockerignore rename to frontend/.dockerignore diff --git a/client/.gitignore b/frontend/.gitignore similarity index 100% rename from client/.gitignore rename to frontend/.gitignore diff --git a/client/.npmrc b/frontend/.npmrc similarity index 100% rename from client/.npmrc rename to frontend/.npmrc diff --git a/client/.prettierignore b/frontend/.prettierignore similarity index 100% rename from client/.prettierignore rename to frontend/.prettierignore diff --git a/client/.prettierrc b/frontend/.prettierrc similarity index 100% rename from client/.prettierrc rename to frontend/.prettierrc diff --git a/client/README.md b/frontend/README.md similarity index 100% rename from client/README.md rename to frontend/README.md diff --git a/client/licenses.csv b/frontend/licenses.csv similarity index 100% rename from client/licenses.csv rename to frontend/licenses.csv diff --git a/client/package.json b/frontend/package.json similarity index 100% rename from client/package.json rename to frontend/package.json diff --git a/client/pnpm-lock.yaml b/frontend/pnpm-lock.yaml similarity index 100% rename from client/pnpm-lock.yaml rename to frontend/pnpm-lock.yaml diff --git a/client/src/app.css b/frontend/src/app.css similarity index 100% rename from client/src/app.css rename to frontend/src/app.css diff --git a/client/src/app.html b/frontend/src/app.html similarity index 100% rename from client/src/app.html rename to frontend/src/app.html diff --git a/client/src/global.d.ts b/frontend/src/global.d.ts similarity index 100% rename from client/src/global.d.ts rename to frontend/src/global.d.ts diff --git a/client/src/lib/api.ts b/frontend/src/lib/api.ts similarity index 100% rename from client/src/lib/api.ts rename to frontend/src/lib/api.ts diff --git a/client/src/lib/crypto.ts b/frontend/src/lib/crypto.ts similarity index 100% rename from client/src/lib/crypto.ts rename to frontend/src/lib/crypto.ts diff --git a/client/src/lib/files.ts b/frontend/src/lib/files.ts similarity index 100% rename from client/src/lib/files.ts rename to frontend/src/lib/files.ts diff --git a/client/src/lib/stores/status.ts b/frontend/src/lib/stores/status.ts similarity index 100% rename from client/src/lib/stores/status.ts rename to frontend/src/lib/stores/status.ts diff --git a/client/src/lib/ui/AboutParagraph.svelte b/frontend/src/lib/ui/AboutParagraph.svelte similarity index 100% rename from client/src/lib/ui/AboutParagraph.svelte rename to frontend/src/lib/ui/AboutParagraph.svelte diff --git a/client/src/lib/ui/Button.svelte b/frontend/src/lib/ui/Button.svelte similarity index 100% rename from client/src/lib/ui/Button.svelte rename to frontend/src/lib/ui/Button.svelte diff --git a/client/src/lib/ui/FileUpload.svelte b/frontend/src/lib/ui/FileUpload.svelte similarity index 100% rename from client/src/lib/ui/FileUpload.svelte rename to frontend/src/lib/ui/FileUpload.svelte diff --git a/client/src/lib/ui/Icon.svelte b/frontend/src/lib/ui/Icon.svelte similarity index 100% rename from client/src/lib/ui/Icon.svelte rename to frontend/src/lib/ui/Icon.svelte diff --git a/client/src/lib/ui/MaxSize.svelte b/frontend/src/lib/ui/MaxSize.svelte similarity index 100% rename from client/src/lib/ui/MaxSize.svelte rename to frontend/src/lib/ui/MaxSize.svelte diff --git a/client/src/lib/ui/ShowNote.svelte b/frontend/src/lib/ui/ShowNote.svelte similarity index 100% rename from client/src/lib/ui/ShowNote.svelte rename to frontend/src/lib/ui/ShowNote.svelte diff --git a/client/src/lib/ui/Switch.svelte b/frontend/src/lib/ui/Switch.svelte similarity index 100% rename from client/src/lib/ui/Switch.svelte rename to frontend/src/lib/ui/Switch.svelte diff --git a/client/src/lib/ui/TextArea.svelte b/frontend/src/lib/ui/TextArea.svelte similarity index 100% rename from client/src/lib/ui/TextArea.svelte rename to frontend/src/lib/ui/TextArea.svelte diff --git a/client/src/lib/ui/TextInput.svelte b/frontend/src/lib/ui/TextInput.svelte similarity index 100% rename from client/src/lib/ui/TextInput.svelte rename to frontend/src/lib/ui/TextInput.svelte diff --git a/client/src/lib/ui/ThemeToggle.svelte b/frontend/src/lib/ui/ThemeToggle.svelte similarity index 100% rename from client/src/lib/ui/ThemeToggle.svelte rename to frontend/src/lib/ui/ThemeToggle.svelte diff --git a/client/src/lib/views/Create.svelte b/frontend/src/lib/views/Create.svelte similarity index 100% rename from client/src/lib/views/Create.svelte rename to frontend/src/lib/views/Create.svelte diff --git a/client/src/lib/views/Footer.svelte b/frontend/src/lib/views/Footer.svelte similarity index 100% rename from client/src/lib/views/Footer.svelte rename to frontend/src/lib/views/Footer.svelte diff --git a/client/src/lib/views/Header.svelte b/frontend/src/lib/views/Header.svelte similarity index 100% rename from client/src/lib/views/Header.svelte rename to frontend/src/lib/views/Header.svelte diff --git a/client/src/routes/__layout.svelte b/frontend/src/routes/__layout.svelte similarity index 100% rename from client/src/routes/__layout.svelte rename to frontend/src/routes/__layout.svelte diff --git a/client/src/routes/about.svelte b/frontend/src/routes/about.svelte similarity index 100% rename from client/src/routes/about.svelte rename to frontend/src/routes/about.svelte diff --git a/client/src/routes/index.svelte b/frontend/src/routes/index.svelte similarity index 100% rename from client/src/routes/index.svelte rename to frontend/src/routes/index.svelte diff --git a/client/src/routes/note/[id].svelte b/frontend/src/routes/note/[id].svelte similarity index 100% rename from client/src/routes/note/[id].svelte rename to frontend/src/routes/note/[id].svelte diff --git a/client/static/favicon.png b/frontend/static/favicon.png similarity index 100% rename from client/static/favicon.png rename to frontend/static/favicon.png diff --git a/client/static/icons/contrast-sharp.svg b/frontend/static/icons/contrast-sharp.svg similarity index 100% rename from client/static/icons/contrast-sharp.svg rename to frontend/static/icons/contrast-sharp.svg diff --git a/client/static/icons/copy-sharp.svg b/frontend/static/icons/copy-sharp.svg similarity index 100% rename from client/static/icons/copy-sharp.svg rename to frontend/static/icons/copy-sharp.svg diff --git a/client/static/icons/dice-sharp.svg b/frontend/static/icons/dice-sharp.svg similarity index 100% rename from client/static/icons/dice-sharp.svg rename to frontend/static/icons/dice-sharp.svg diff --git a/client/static/icons/eye-off-sharp.svg b/frontend/static/icons/eye-off-sharp.svg similarity index 100% rename from client/static/icons/eye-off-sharp.svg rename to frontend/static/icons/eye-off-sharp.svg diff --git a/client/static/icons/eye-sharp.svg b/frontend/static/icons/eye-sharp.svg similarity index 100% rename from client/static/icons/eye-sharp.svg rename to frontend/static/icons/eye-sharp.svg diff --git a/client/static/icons/lock-closed-sharp.svg b/frontend/static/icons/lock-closed-sharp.svg similarity index 100% rename from client/static/icons/lock-closed-sharp.svg rename to frontend/static/icons/lock-closed-sharp.svg diff --git a/client/static/robots.txt b/frontend/static/robots.txt similarity index 100% rename from client/static/robots.txt rename to frontend/static/robots.txt diff --git a/client/svelte.config.js b/frontend/svelte.config.js similarity index 100% rename from client/svelte.config.js rename to frontend/svelte.config.js diff --git a/client/tsconfig.json b/frontend/tsconfig.json similarity index 100% rename from client/tsconfig.json rename to frontend/tsconfig.json diff --git a/package.json b/package.json index 9d35b74..e478bcd 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,13 @@ { "scripts": { "dev:docker": "docker-compose up memcached", - "dev:backend": "cargo watch -x 'run --bin cryptgeon'", - "dev:front": "pnpm --prefix client run dev", + "dev:backend": "cd backend && cargo watch -x 'run --bin cryptgeon'", + "dev:front": "pnpm --prefix frontend run dev", "dev:proxy": "node proxy.mjs", "dev": "run-p dev:*" }, "devDependencies": { "http-proxy": "^1.18.1", "npm-run-all": "^4.1.5" - }, - "dependencies": { - "file-saver": "^2.0.5", - "pretty-bytes": "^5.6.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 600da50..c8db2a9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,14 +1,8 @@ lockfileVersion: 5.3 specifiers: - file-saver: ^2.0.5 http-proxy: ^1.18.1 npm-run-all: ^4.1.5 - pretty-bytes: ^5.6.0 - -dependencies: - file-saver: 2.0.5 - pretty-bytes: 5.6.0 devDependencies: http-proxy: 1.18.1 @@ -128,10 +122,6 @@ packages: resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==} dev: true - /file-saver/2.0.5: - resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==} - dev: false - /follow-redirects/1.14.6: resolution: {integrity: sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==} engines: {node: '>=4.0'} @@ -367,11 +357,6 @@ packages: engines: {node: '>=4'} dev: true - /pretty-bytes/5.6.0: - resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==} - engines: {node: '>=6'} - dev: false - /read-pkg/3.0.0: resolution: {integrity: sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=} engines: {node: '>=4'}