Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.1.0 release #457

Merged
merged 83 commits into from
Aug 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
5e0c2aa
Starting 1.1
wyatt-herkamp May 28, 2022
2957854
Merge branch 'master' into dev
wyatt-herkamp May 28, 2022
51d8a0a
Updates
wyatt-herkamp May 28, 2022
65a7d18
Code Cleanup
wyatt-herkamp May 30, 2022
4f815cb
More Storage Handlers
wyatt-herkamp May 30, 2022
c4b716d
Repository basic Create, Delete, Get, and List
wyatt-herkamp May 30, 2022
a59b7cb
handler building
wyatt-herkamp May 30, 2022
ded644a
Merge branch 'master' into dev
wyatt-herkamp May 31, 2022
63652e1
Repository Handlers
wyatt-herkamp May 31, 2022
7ff4ff5
Repository Handlers
wyatt-herkamp May 31, 2022
6161511
Improved the Config System for Repository Config
wyatt-herkamp May 31, 2022
81d8ef8
added repository update and cleaned up settings some more
wyatt-herkamp May 31, 2022
259fe3e
Removed a bunch of session manager creations
wyatt-herkamp Jun 1, 2022
e338877
Just a random structure
wyatt-herkamp Jun 3, 2022
2561363
Init New Website (#466)
Jul 12, 2022
900f471
Merge
wyatt-herkamp Jul 12, 2022
83a4a03
Merge
wyatt-herkamp Jul 12, 2022
886b53c
Removed Stuff
wyatt-herkamp Jul 12, 2022
c878e7c
Made the frontend build
wyatt-herkamp Jul 13, 2022
48d2020
Starting to make backend queries again
wyatt-herkamp Jul 13, 2022
5a81756
More Code layout
wyatt-herkamp Jul 14, 2022
8c8d1cd
Doc Fix
wyatt-herkamp Jul 14, 2022
773185f
Doc Fix
wyatt-herkamp Jul 14, 2022
14c78a7
CI docs
wyatt-herkamp Jul 14, 2022
47f1e6c
Less broken stuff
wyatt-herkamp Jul 14, 2022
e6d01eb
Backend Depend Updates
wyatt-herkamp Jul 15, 2022
e89c436
As of now it requires beta.
wyatt-herkamp Jul 15, 2022
006fc34
Depend Updates
wyatt-herkamp Jul 17, 2022
b28e27f
Depend Updates
wyatt-herkamp Jul 17, 2022
441ca12
Define the repository config handlers via a macro
wyatt-herkamp Jul 18, 2022
d5a399f
Using Macros for more code
wyatt-herkamp Jul 18, 2022
e976fc8
Repository Handler Macro
wyatt-herkamp Jul 18, 2022
f3d348d
Another Macro
wyatt-herkamp Jul 19, 2022
9113923
Merge branch 'master' into dev
wyatt-herkamp Jul 19, 2022
cf40f1c
Updates
wyatt-herkamp Jul 19, 2022
724b401
Repository Page
wyatt-herkamp Jul 19, 2022
dc9a66c
Merge branch 'master' into dev
wyatt-herkamp Jul 19, 2022
756e052
Maven Deploy Works again, Project and Repository Pages, Improved the …
wyatt-herkamp Jul 19, 2022
b46502a
Another Install Method and started a docker file
wyatt-herkamp Jul 20, 2022
d25a4a1
Strip some code
wyatt-herkamp Jul 20, 2022
a74b76e
Fix session
wyatt-herkamp Jul 20, 2022
2fafbe0
Added the concept of a ProxyMavenRepository
wyatt-herkamp Jul 20, 2022
c32daef
Staging Layout
wyatt-herkamp Jul 20, 2022
45d47d2
Proof of concept with proxy
wyatt-herkamp Jul 20, 2022
08fed48
Staging Starter
wyatt-herkamp Jul 21, 2022
61097df
Repositories with State
wyatt-herkamp Jul 21, 2022
dee14a9
its "working" again
wyatt-herkamp Jul 21, 2022
a38dbb8
Setting Handlers
wyatt-herkamp Jul 21, 2022
4576fd2
Repository Loading is Complete
wyatt-herkamp Jul 22, 2022
55aea48
Fix Directory Response. Hopefully didnt break Linux
wyatt-herkamp Jul 22, 2022
ae3faa4
Clippy Error
wyatt-herkamp Jul 22, 2022
ef08f97
Pushing to a Git is possible now
wyatt-herkamp Jul 22, 2022
30feea1
Pushing to an external is possible now
wyatt-herkamp Jul 22, 2022
4b969d9
Started to work on the authentication API and the cli
wyatt-herkamp Jul 27, 2022
5e77934
Depend Updates
wyatt-herkamp Jul 28, 2022
e63e393
Stops Querying the password every database user request. Changed the …
wyatt-herkamp Jul 29, 2022
a498d8a
API delete, list, and add added.
wyatt-herkamp Jul 30, 2022
acf00d0
Dropped the Argon for the API tokens using regular Sha512
wyatt-herkamp Jul 31, 2022
042bcc9
Finished the User and Authentication Stuff
wyatt-herkamp Jul 31, 2022
69f836c
Repository Last Updated Added
wyatt-herkamp Jul 31, 2022
cc3a259
Markdown Rendering stuff
wyatt-herkamp Aug 1, 2022
4311740
Repository Page
wyatt-herkamp Aug 1, 2022
4b17076
Lots of Code Cleanup
wyatt-herkamp Aug 1, 2022
a2d0d3e
Improvements for settings and Maven
wyatt-herkamp Aug 2, 2022
9f30840
Merge branch 'master' into dev
wyatt-herkamp Aug 3, 2022
e1df429
Updating the Error Stuff some more
wyatt-herkamp Aug 3, 2022
fb0dac1
bringing us closer to having a "working" 1.1
wyatt-herkamp Aug 4, 2022
0c10e45
Removed Anyhow, Started to work on Repository Layout in the frontend
wyatt-herkamp Aug 8, 2022
97a32c1
Removed a bunch of warnings.
wyatt-herkamp Aug 8, 2022
ee5733a
unsafe_cookies, more create handlers, dropped APIError, StorageError …
Aug 10, 2022
cef46e0
Create Repository Fixes, more work on the update repository page.
Aug 11, 2022
990c402
Version Info
Aug 17, 2022
9cc3f0b
Added an UndefinedSettingConfig
Aug 17, 2022
70da8af
Markdown Editor
Aug 17, 2022
1dad6a4
Got the browse Box working a bit now
Aug 17, 2022
9dbefc4
Raw Support
Aug 18, 2022
3a2b2e1
Windows Installer Work
Aug 18, 2022
93a9dfa
Windows Installer Work
Aug 18, 2022
951688c
Installer Work
Aug 18, 2022
e5760a6
User Admin Page
Aug 19, 2022
de472df
Starting to work on the docker stuff
Aug 19, 2022
0115830
Rebuilt Badge Code
Aug 19, 2022
db48f5c
Merge remote-tracking branch 'origin/master' into dev
Aug 19, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
backend/target
backend/test/
nrc/
docs/
.idea

log
frontend/node_modules
frontend/dist
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
backend/target
backend/test
nrc/target

backend/test/
*.iml
.idea
log
Expand All @@ -19,4 +22,6 @@ docs/docs/.vitepress/dist/
*.log
*.env*
*.tar.gz
test/
backend/test/
frontend.zip
backend/src/authentication/.vs
33 changes: 33 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
FROM rust:latest AS build
COPY . /home/build
WORKDIR /home/build

LABEL org.label-schema.name="nitro_repo" \
org.label-schema.vendor="wyatt-herkamp" \
org.label-schema.schema-version="1.0"


RUN apt-get update; apt-get install -y curl \
&& curl -sL https://deb.nodesource.com/setup_18.x | bash - \
&& apt-get install -y nodejs \
&& curl -L https://www.npmjs.com/install.sh | sh

WORKDIR /home/build/backend
RUN cargo build --release --features multi_storage,ssl,clap,whoami
# Build Frontend
WORKDIR /home/build/frontend
RUN npm install
RUN npm run build

# The Final Image
FROM alpine:latest

RUN mkdir -p /app/data/storages && mkdir -p /var/log/nitro_repo
VOLUME /app/data
WORKDIR /app
COPY --from=build /home/build/nitro_repo/backend/target/release/nitro_repo_full nitro_repo_full
COPY --from=build /home/build/nitro_repo/backend/target/release/simple_installer simple_installer
COPY --from=build /home/build/nitro_repo/frontend/dist frontend
COPY --from=build /home/build/nitro_repo/entrypoint.sh entrypoint.sh
ENTRYPOINT ["/bin/sh", "entrypoint.sh"]
CMD []
103 changes: 67 additions & 36 deletions backend/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,66 +1,97 @@
[package]
name = "nitro_repo"
version = "1.0.3"
version = "1.1.0-BETA"
authors = ["Wyatt Jacob Herkamp <wherkamp@kingtux.me>"]
edition = "2021"
build = "build.rs"
license-file = "../LICENSE"
default-run = "nitro_repo_full"

[lib]
name = "api"
path = "src/lib.rs"
[[bin]]
name = "nitro_repo_full"
required-features = ["multi_storage"]
[[bin]]
name = "simple_installer"
required-features = ["clap", "whoami"]
[[bin]]
name = "updator"
required-features = ["clap"]

[dependencies]
# Web
actix-web = { version = "4.1" }
actix-web = { version = "4.1", features = ["cookies"] }
actix-cors = "0.6"
actix-service = "2.0"
openssl = { version = "0.10", features = ["v110"], optional = true }
actix-files = "0.6"
# Partly Web
lettre = "0.10"
handlebars = "4.3"
lettre = "0.10.0"
handlebars = "4.3.2"
# Database
diesel = { version = "1.4.8", features = ["mysql", "r2d2"] }
diesel_migrations = "1.4.0"
r2d2 = "0.8.10"
r2d2_mysql = "21.0.0"
sea-orm = { version = "0.9", features = ["sqlx-mysql", "sqlx-sqlite", "runtime-actix-native-tls", "macros"] }
sqlx = "0.6"
# Serde
serde = { version = "1", features = ["derive"] }
serde_json = "1"
serde-xml-rs = "0.5"
toml = "0.5"

serde = { version = "1.0.139", features = ["derive"] }
serde_json = "1.0.82"
futures = "0.3.21"
toml = "0.5.9"
# utils
rand = "0.8"
rand_core = { version = "0.6", features = ["std"] }
rand = "0.8.5"
rust-embed = { version = "6.4.0", features = ["interpolate-folder-path"] }
argon2 = "0.4"
chrono = "0.4.19"
regex = "1.6"
argon2 = "0.4.1"
chrono = "0.4"
regex = "1.6.0"
futures-util = "0.3.21"
base64 = "0.13.0"
tokio = "1.20"
tokio = { version = "1.20.0", features = ["full"] }
uuid = { version = "1.1.2", features = ["serde", "v4"] }
style-term = "1.0.0"
mime_guess = "2.0.4"
paste = "1.0.7"
reqwest = { version = "0.11.11", features = ["stream"] }
bytes = "1.2.0"
tokio-stream = "0.1.9"
lockfree = "0.5.1"
sha2 = "0.10.2"
# Log
# Unstable Use git = "https://github.com/wherkamp/nitro_log"
nitro_log = { version = "1.0.1", features = ["chrono", "style-term"] }
log = "0.4.17"
nitro_log = { git = "https://github.com/wyatt-herkamp/nitro_log", features = ["chrono", "style-term"] }
log = { version = "0.4.17", features = ["kv_unstable", "kv_unstable_std", "kv_unstable_serde"] }
# Rust Internal
strum = { version = "0.24.1", features = ["derive"] }
strum_macros = "0.24.2"
derive_more = "0.99.17"
async-trait = "0.1.56"
thiserror = "1.0.31"
anyhow = "1.0.58"
either = "1.7.0"
strum = { version = "0.24", features = ["derive"] }
strum_macros = "0.24"
async-trait = "0.1"
thiserror = "1"
# Badge Stuff
badge-maker = "0.3.1"
badge-maker = "0.3"
# Webhook
webhook = "2.0.0"
webhook_sender = { git = "https://github.com/wyatt-herkamp/webhook_sender.git" }
# Installer
tui = "0.19.0"
crossterm = "0.25.0"
clap = { version = "3.2.12", features = ["derive"] }
unicode-width = "0.1.9"
clap = { version = "3.2.12", features = ["derive"], optional = true }
semver = { version = "1", features = ["std", "serde"] }
whoami = { version = "1.2", optional = true }
# Cache
redis = "0.21.5"
comrak = "0.14"
# Staging
tempfile = "3.3.0"
git2 = "0.15"
schemars = "0.8.10"
# Maven Stuff
maven-rs = { git = "https://github.com/wyatt-herkamp/maven-rs.git" }
this_actix_error = { git = "https://github.com/wyatt-herkamp/this_actix_errors.git" }
zip = "0.6"

[build-dependencies]
vergen = "7.1.0"
vergen = { version = "7.0.0" }
[features]
# The latest Updaters will always be under default features
default = ["multi_storage"]
ssl = ["openssl", "actix-web/openssl"]
multi_storage = []

# Development Tools
## Allows you to add a file called unsafe_cookies.txt to the active directory. And contains KEY=VALUE(Value being the user id) for cookies/sessions to be added to the system upon start
unsafe_cookies = []
4 changes: 2 additions & 2 deletions backend/build.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use vergen::{Config, vergen};
use vergen::{vergen, Config};

fn main() {
vergen(Config::default()).unwrap();
}
}
Empty file removed backend/migrations/.gitkeep
Empty file.
1 change: 0 additions & 1 deletion backend/migrations/2021-07-08-184225_create_users/down.sql

This file was deleted.

10 changes: 0 additions & 10 deletions backend/migrations/2021-07-08-184225_create_users/up.sql

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

8 changes: 0 additions & 8 deletions backend/resources/email/forgot_password.html

This file was deleted.

5 changes: 3 additions & 2 deletions backend/resources/log-debug.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
],
"loggers": [
{
"module": "nitro_repo",
"module": "api",
"always_execute": true,
"levels": [
"TRACE",
"DEBUG",
Expand All @@ -47,7 +48,7 @@
]
},
{
"module": "nitro_repo",
"module": "api",
"levels": [
"TRACE",
"DEBUG",
Expand Down
10 changes: 0 additions & 10 deletions backend/resources/pages/error/500.html

This file was deleted.

Loading