Skip to content

Commit

Permalink
Merge pull request #223 from wherkamp/new_frontend
Browse files Browse the repository at this point in the history
New Frontend
  • Loading branch information
Wyatt Jacob Herkamp committed Mar 15, 2022
2 parents b020366 + 4b998d0 commit 9a9ad02
Show file tree
Hide file tree
Showing 117 changed files with 6,564 additions and 2,748 deletions.
21 changes: 15 additions & 6 deletions .github/workflows/rust-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,20 @@ jobs:
build:
if: contains(github.event.pull_request.labels.*.name, 'rust')
runs-on: ubuntu-latest
strategy:
matrix:
rust:
- stable
- 1.58.1
steps:
- uses: actions/checkout@v2
- uses: Swatinem/rust-cache@v1
- name: Update Rust
run: rustup update
- name: Test
run: cargo test --no-default-features

- name: Install toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
override: true
- name: Run cargo build
uses: actions-rs/cargo@v1
with:
command: build
args: --no-default-features
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ site/out
.next
config.json
Cargo.lock
node_modules
node_modules
testInstall.sh
9 changes: 8 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ futures-util = "0.3.17"
time = "0.3.5"
base64 = "0.13.0"
tokio = "1.14.0"

# Log
nitro_log = { git = "https://github.com/wherkamp/nitro_log", features = ["time", "colors"] }
log = "0.4.14"
Expand All @@ -62,6 +63,8 @@ strum = { version = "0.24.0", features = ["derive"] }
strum_macros = "0.24.0"
derive_more = "0.99.14"
async-trait = "0.1.51"
thiserror = "1.0.30"
anyhow = "1.0.56"
# Badge Stuff
badge-maker = "0.2.0"
usvg = "0.22.0"
Expand All @@ -70,7 +73,11 @@ tiny-skia = "0.6.1"
# Webhook
webhook = "2.0.0"
zip = "0.5.13"

# Installer
tui = "0.17"
crossterm = "0.22"
clap = { version = "3.1.6", features = ["derive"] }
unicode-width = "0.1.9"
[build-dependencies]
zip = "0.5.13"
walkdir = "2.3.2"
Expand Down
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ fn doit(
let path = Path::new(dst_file);
let file = File::create(&path).unwrap();

let walkdir = WalkDir::new(src_dir.to_string());
let walkdir = WalkDir::new(src_dir);
let it = walkdir.into_iter();

zip_dir(&mut it.filter_map(|e| e.ok()), src_dir, file, method)?;
Expand Down
4 changes: 3 additions & 1 deletion example.env
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ LOG_LOCATION="./"
# Actix Bind Address
ADDRESS="0.0.0.0:6742"
# MODE
MODE=RELEASE
MODE=RELEASE
#Max Upload in MB
MAX_UPLOAD=1024
43 changes: 43 additions & 0 deletions resources/log-install.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"default_loggers": [
{
"levels": [
"TRACE",
"DEBUG",
"INFO",
"WARN",
"ERROR"
],
"targets": [
{
"type": "file-logger",
"properties": {
"format": "%datetime_{format='$Y-$m-$d $H:$M:$S'}% %module% %level%: %message%",
"file": "install.log"
}
}
]
}
],
"loggers": [
{
"module": "nitro_repo",
"levels": [
"TRACE",
"DEBUG",
"INFO",
"WARN",
"ERROR"
],
"targets": [
{
"type": "file-logger",
"properties": {
"format": "%datetime_{format='$Y-$m-$d $H:$M:$S'}% %module% %level%: %message%",
"file": "install.log"
}
}
]
}
]
}
6 changes: 6 additions & 0 deletions resources/settings.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,9 @@ name = "Public Name"
type = "string"
default = "Nitro Repo"
public = true
[[settings]]
key = "description"
name = "Website Description"
type = "string"
default = "An open source artifact manager. Written in Rust back end and an Vue front end to create a fast and modern experience"
public = true
1 change: 1 addition & 0 deletions site/.nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v17.7.1
34 changes: 22 additions & 12 deletions site/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,41 @@

declare module 'vue' {
export interface GlobalComponents {
CodeViewComp: typeof import('./src/components/CodeViewComp.vue')['default']
CopyMenu: typeof import('./src/components/repo/types/maven/copy/CopyMenu.vue')['default']
CreateRepo: typeof import('./src/components/CreateRepo.vue')['default']
CreateStorage: typeof import('./src/components/CreateStorage.vue')['default']
CreateUser: typeof import('./src/components/CreateUser.vue')['default']
ElAside: typeof import('element-plus/es')['ElAside']
ElButton: typeof import('element-plus/es')['ElButton']
ElContainer: typeof import('element-plus/es')['ElContainer']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElInput: typeof import('element-plus/es')['ElInput']
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
DeployRepo: typeof import('./src/components/repo/update/DeployRepo.vue')['default']
EditItem: typeof import('./src/components/repo/edit/EditItem.vue')['default']
EditMenu: typeof import('./src/components/repo/edit/EditMenu.vue')['default']
FrontendRepo: typeof import('./src/components/repo/update/FrontendRepo.vue')['default']
GeneralRepo: typeof import('./src/components/repo/update/GeneralRepo.vue')['default']
Item: typeof import('./src/components/admin/Item.vue')['default']
Login: typeof import('./src/components/nav/Login.vue')['default']
MavenProjectCopy: typeof import('./src/components/project/types/maven/copy/MavenProjectCopy.vue')['default']
MavenProjectInfo: typeof import('./src/components/project/types/maven/MavenProjectInfo.vue')['default']
MavenRepoInfo: typeof import('./src/components/repo/types/maven/MavenRepoInfo.vue')['default']
MavenUpload: typeof import('./src/components/upload/MavenUpload.vue')['default']
Me: typeof import('./src/components/Me.vue')['default']
MenuButton: typeof import('./src/components/nav/MenuButton.vue')['default']
Navbar: typeof import('./src/components/Navbar.vue')['default']
Navbar: typeof import('./src/components/nav/Navbar.vue')['default']
ProjectBadge: typeof import('./src/components/project/badge/ProjectBadge.vue')['default']
Repositories: typeof import('./src/components/Repositories.vue')['default']
RepositoryBadge: typeof import('./src/components/repo/badge/RepositoryBadge.vue')['default']
SecurityRepo: typeof import('./src/components/repo/update/SecurityRepo.vue')['default']
Settings: typeof import('./src/components/Settings.vue')['default']
SideBar: typeof import('./src/components/admin/SideBar.vue')['default']
SideBar: typeof import('./src/components/SideBar.vue')['default']
Storages: typeof import('./src/components/Storages.vue')['default']
UpdateRepository: typeof import('./src/components/UpdateRepository.vue')['default']
Switch: typeof import('./src/components/other/Switch.vue')['default']
UpdateRepo: typeof import('./src/components/repo/update/UpdateRepo.vue')['default']
UpdateStorage: typeof import('./src/components/UpdateStorage.vue')['default']
UpdateUser: typeof import('./src/components/UpdateUser.vue')['default']
UserEditMenu: typeof import('./src/components/user/edit/UserEditMenu.vue')['default']
UserGeneral: typeof import('./src/components/user/update/UserGeneral.vue')['default']
UserPassword: typeof import('./src/components/user/update/UserPassword.vue')['default']
Users: typeof import('./src/components/Users.vue')['default']
ViewProject: typeof import('./src/components/project/ViewProject.vue')['default']
ViewRepo: typeof import('./src/components/repo/ViewRepo.vue')['default']
}
}
Expand Down
Loading

0 comments on commit 9a9ad02

Please sign in to comment.