Fixed setup errors and removed openssl installs

Fixed errors during setup

Removed SSL  install from CI pipeline for x86 builds
This commit is contained in:
Joe Bellus 2022-02-12 02:42:32 -05:00
parent b682d44bf4
commit 2a1d0737a0
3 changed files with 5 additions and 9 deletions

View File

@ -12,8 +12,6 @@ test:
script: script:
- mkdir dist - mkdir dist
- touch dist/index.html - touch dist/index.html
- apt-get update
- apt-get -y install pkg-config
- cargo test - cargo test
build-ui: build-ui:
@ -40,8 +38,6 @@ build-x64-bin:
rules: rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
script: script:
- apt-get update
- apt-get -y install libssl-dev pkg-config
- cargo build --release - cargo build --release
- cd target/release - cd target/release
- tar -czf ../../vade-linux-x64.tar.gz vade - tar -czf ../../vade-linux-x64.tar.gz vade

View File

@ -62,7 +62,7 @@ impl actix_web::error::ResponseError for Error {
fn status_code(&self) -> actix_web::http::StatusCode { fn status_code(&self) -> actix_web::http::StatusCode {
match self.code { match self.code {
ErrorCode::UnAuthorized => StatusCode::UNAUTHORIZED, ErrorCode::UnAuthorized => StatusCode::UNAUTHORIZED,
ErrorCode::NoSetup => StatusCode::OK, ErrorCode::NoSetup => StatusCode::UPGRADE_REQUIRED,
_ => StatusCode::INTERNAL_SERVER_ERROR, _ => StatusCode::INTERNAL_SERVER_ERROR,
} }
} }

View File

@ -191,14 +191,14 @@ export default {
} }
}, },
async reload() { async reload() {
this.applications = (await axios.get("/api/applications")).data.items; this.applications = (await axios.get("/api/applications")).data.items || [];
this.applicationCategories = ( this.applicationCategories = (
await axios.get("/api/application_categories") await axios.get("/api/application_categories")
).data.items; ).data.items || [];
this.bookmarks = (await axios.get("/api/bookmarks")).data.items; this.bookmarks = (await axios.get("/api/bookmarks")).data.items || [];
this.bookmarkCategories = ( this.bookmarkCategories = (
await axios.get("/api/bookmark_categories") await axios.get("/api/bookmark_categories")
).data.items; ).data.items || [];
this.editApp = {}; this.editApp = {};
this.editAppCat = {}; this.editAppCat = {};