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

Feature/hot fixes #136

Merged
merged 8 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/digitalOcean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
deploy:
runs-on: self-hosted
runs-on: ubuntu-latest

steps:
- name: Checkout code
Expand Down
130 changes: 62 additions & 68 deletions Desktop/.svelte-kit/ambient.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,95 +28,92 @@
declare module '$env/static/private' {
export const SHELL: string;
export const SESSION_MANAGER: string;
export const USER_ZDOTDIR: string;
export const COLORTERM: string;
export const XDG_CONFIG_DIRS: string;
export const XDG_SESSION_PATH: string;
export const LESS: string;
export const COREPACK_ENABLE_DOWNLOAD_PROMPT: string;
export const XDG_MENU_PREFIX: string;
export const TERM_PROGRAM_VERSION: string;
export const ICEAUTHORITY: string;
export const _P9K_TTY: string;
export const LESS_TERMCAP_se: string;
export const LESS_TERMCAP_so: string;
export const LC_ADDRESS: string;
export const LC_NAME: string;
export const P9K_TTY: string;
export const MEMORY_PRESSURE_WRITE: string;
export const XMODIFIERS: string;
export const DESKTOP_SESSION: string;
export const LC_MONETARY: string;
export const GTK_RC_FILES: string;
export const NO_AT_BRIDGE: string;
export const EDITOR: string;
export const GTK_MODULES: string;
export const XDG_SEAT: string;
export const PWD: string;
export const XDG_SESSION_DESKTOP: string;
export const LOGNAME: string;
export const QT_QPA_PLATFORMTHEME: string;
export const XDG_SESSION_TYPE: string;
export const SYSTEMD_EXEC_PID: string;
export const _: string;
export const XAUTHORITY: string;
export const LS_OPTIONS: string;
export const VSCODE_GIT_ASKPASS_NODE: string;
export const MOTD_SHOWN: string;
export const GTK2_RC_FILES: string;
export const VSCODE_INJECTION: string;
export const GDM_LANG: string;
export const HOME: string;
export const USERNAME: string;
export const COREPACK_ROOT: string;
export const LANG: string;
export const LC_PAPER: string;
export const LS_COLORS: string;
export const XDG_CURRENT_DESKTOP: string;
export const npm_package_version: string;
export const AMD_VULKAN_ICD: string;
export const MEMORY_PRESSURE_WATCH: string;
export const STARSHIP_SHELL: string;
export const MANROFFOPT: string;
export const VTE_VERSION: string;
export const WAYLAND_DISPLAY: string;
export const GIT_ASKPASS: string;
export const XDG_SEAT_PATH: string;
export const INVOCATION_ID: string;
export const MANAGERPID: string;
export const GNOME_TERMINAL_SCREEN: string;
export const INIT_CWD: string;
export const CHROME_DESKTOP: string;
export const STARSHIP_SESSION_KEY: string;
export const KDE_SESSION_UID: string;
export const VSCODE_GIT_ASKPASS_EXTRA_ARGS: string;
export const GNOME_SETUP_DISPLAY: string;
export const XDG_SESSION_CLASS: string;
export const TERM: string;
export const LC_IDENTIFICATION: string;
export const TERM: string;
export const npm_package_name: string;
export const LESS_TERMCAP_mb: string;
export const LESS_TERMCAP_me: string;
export const LESS_TERMCAP_md: string;
export const VSCODE_NONCE: string;
export const ZDOTDIR: string;
export const PROJECT_CWD: string;
export const USER: string;
export const VSCODE_GIT_IPC_HANDLE: string;
export const CUDA_PATH: string;
export const QT_WAYLAND_RECONNECT: string;
export const KDE_SESSION_VERSION: string;
export const PAM_KWALLET5_LOGIN: string;
export const MANPAGER: string;
export const VISUAL: string;
export const GNOME_TERMINAL_SERVICE: string;
export const DISPLAY: string;
export const npm_lifecycle_event: string;
export const SHLVL: string;
export const MOZ_ENABLE_WAYLAND: string;
export const LESS_TERMCAP_ue: string;
export const LESS_TERMCAP_us: string;
export const LC_TELEPHONE: string;
export const QT_IM_MODULE: string;
export const LC_MEASUREMENT: string;
export const XDG_VTNR: string;
export const UBUNTU_MENUPROXY: string;
export const XDG_SESSION_ID: string;
export const _P9K_SSH_TTY: string;
export const npm_config_user_agent: string;
export const npm_execpath: string;
export const LD_LIBRARY_PATH: string;
export const XDG_RUNTIME_DIR: string;
export const MKLROOT: string;
export const NVCC_CCBIN: string;
export const DEBUGINFOD_URLS: string;
export const npm_package_json: string;
export const LC_TIME: string;
export const P9K_SSH: string;
export const BERRY_BIN_FOLDER: string;
export const VSCODE_GIT_ASKPASS_MAIN: string;
export const QT_AUTO_SCREEN_SCALE_FACTOR: string;
export const JOURNAL_STREAM: string;
export const XDG_DATA_DIRS: string;
export const GDK_BACKEND: string;
export const KDE_FULL_SESSION: string;
export const BROWSER: string;
export const PATH: string;
export const GTK_USE_PORTAL: string;
export const GDMSESSION: string;
export const ORIGINAL_XDG_CURRENT_DESKTOP: string;
export const DBUS_SESSION_BUS_ADDRESS: string;
export const KDE_APPLICATIONS_AS_SCOPE: string;
export const MAIL: string;
export const npm_node_execpath: string;
export const LC_NUMERIC: string;
Expand Down Expand Up @@ -155,95 +152,92 @@ declare module '$env/dynamic/private' {
export const env: {
SHELL: string;
SESSION_MANAGER: string;
USER_ZDOTDIR: string;
COLORTERM: string;
XDG_CONFIG_DIRS: string;
XDG_SESSION_PATH: string;
LESS: string;
COREPACK_ENABLE_DOWNLOAD_PROMPT: string;
XDG_MENU_PREFIX: string;
TERM_PROGRAM_VERSION: string;
ICEAUTHORITY: string;
_P9K_TTY: string;
LESS_TERMCAP_se: string;
LESS_TERMCAP_so: string;
LC_ADDRESS: string;
LC_NAME: string;
P9K_TTY: string;
MEMORY_PRESSURE_WRITE: string;
XMODIFIERS: string;
DESKTOP_SESSION: string;
LC_MONETARY: string;
GTK_RC_FILES: string;
NO_AT_BRIDGE: string;
EDITOR: string;
GTK_MODULES: string;
XDG_SEAT: string;
PWD: string;
XDG_SESSION_DESKTOP: string;
LOGNAME: string;
QT_QPA_PLATFORMTHEME: string;
XDG_SESSION_TYPE: string;
SYSTEMD_EXEC_PID: string;
_: string;
XAUTHORITY: string;
LS_OPTIONS: string;
VSCODE_GIT_ASKPASS_NODE: string;
MOTD_SHOWN: string;
GTK2_RC_FILES: string;
VSCODE_INJECTION: string;
GDM_LANG: string;
HOME: string;
USERNAME: string;
COREPACK_ROOT: string;
LANG: string;
LC_PAPER: string;
LS_COLORS: string;
XDG_CURRENT_DESKTOP: string;
npm_package_version: string;
AMD_VULKAN_ICD: string;
MEMORY_PRESSURE_WATCH: string;
STARSHIP_SHELL: string;
MANROFFOPT: string;
VTE_VERSION: string;
WAYLAND_DISPLAY: string;
GIT_ASKPASS: string;
XDG_SEAT_PATH: string;
INVOCATION_ID: string;
MANAGERPID: string;
GNOME_TERMINAL_SCREEN: string;
INIT_CWD: string;
CHROME_DESKTOP: string;
STARSHIP_SESSION_KEY: string;
KDE_SESSION_UID: string;
VSCODE_GIT_ASKPASS_EXTRA_ARGS: string;
GNOME_SETUP_DISPLAY: string;
XDG_SESSION_CLASS: string;
TERM: string;
LC_IDENTIFICATION: string;
TERM: string;
npm_package_name: string;
LESS_TERMCAP_mb: string;
LESS_TERMCAP_me: string;
LESS_TERMCAP_md: string;
VSCODE_NONCE: string;
ZDOTDIR: string;
PROJECT_CWD: string;
USER: string;
VSCODE_GIT_IPC_HANDLE: string;
CUDA_PATH: string;
QT_WAYLAND_RECONNECT: string;
KDE_SESSION_VERSION: string;
PAM_KWALLET5_LOGIN: string;
MANPAGER: string;
VISUAL: string;
GNOME_TERMINAL_SERVICE: string;
DISPLAY: string;
npm_lifecycle_event: string;
SHLVL: string;
MOZ_ENABLE_WAYLAND: string;
LESS_TERMCAP_ue: string;
LESS_TERMCAP_us: string;
LC_TELEPHONE: string;
QT_IM_MODULE: string;
LC_MEASUREMENT: string;
XDG_VTNR: string;
UBUNTU_MENUPROXY: string;
XDG_SESSION_ID: string;
_P9K_SSH_TTY: string;
npm_config_user_agent: string;
npm_execpath: string;
LD_LIBRARY_PATH: string;
XDG_RUNTIME_DIR: string;
MKLROOT: string;
NVCC_CCBIN: string;
DEBUGINFOD_URLS: string;
npm_package_json: string;
LC_TIME: string;
P9K_SSH: string;
BERRY_BIN_FOLDER: string;
VSCODE_GIT_ASKPASS_MAIN: string;
QT_AUTO_SCREEN_SCALE_FACTOR: string;
JOURNAL_STREAM: string;
XDG_DATA_DIRS: string;
GDK_BACKEND: string;
KDE_FULL_SESSION: string;
BROWSER: string;
PATH: string;
GTK_USE_PORTAL: string;
GDMSESSION: string;
ORIGINAL_XDG_CURRENT_DESKTOP: string;
DBUS_SESSION_BUS_ADDRESS: string;
KDE_APPLICATIONS_AS_SCOPE: string;
MAIL: string;
npm_node_execpath: string;
LC_NUMERIC: string;
Expand Down
Binary file added Desktop/public/images/DriveDashboard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Desktop/public/images/DriveGalleryScreen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Desktop/public/images/GalleryScreen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Desktop/public/images/ModelContentScreen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Desktop/public/images/ModelsScreen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Desktop/public/images/NavBar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Desktop/public/images/PipesScreen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Desktop/public/images/UploadChoose.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Desktop/public/images/VideoNotDownloaded.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Desktop/src/components/DriveCard.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@

<!-- svelte-ignore a11y-click-events-have-key-events -->
<div
class="background-card relative overflow-hidden rounded-lg {listType !==
class="background-card text-white relative overflow-hidden rounded-lg {listType !==
'grid'
? 'w-5/6 flex flex-row align-center justify-between'
: 'w-10/12 mx-auto'}
Expand Down
2 changes: 2 additions & 0 deletions Desktop/src/components/InstallerGuide.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script>
import { Button, Icon } from "svelte-materialify";
import { mdiEyeOff, mdiEye } from "@mdi/js";
import { push } from "svelte-spa-router";

let currentStep = 0;
const steps = [
Expand Down Expand Up @@ -47,6 +48,7 @@
} else {
// Logic to move to the rest of the application can go here
alert("Installation complete! Moving on to the rest of the application...");
push("/gallery");
}
}

Expand Down
14 changes: 7 additions & 7 deletions Desktop/src/components/InviteMembers.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
}
}

const goToGallery = async () => {
push("/gallery");
const goToTutorial = async () => {
push("/install");
}

const sendEmails = async () => {
Expand All @@ -29,7 +29,7 @@
teamName: window.electronAPI.getTeamName(),
});
console.log(response);
push("/gallery");
push("/install");
} catch (error) {
console.error("Sending invites failed:", error);
}
Expand All @@ -49,7 +49,7 @@
<TextField
bind:value={email}
outlined
class="border border-dark-primary ">Email address
class="border-b border-dark-primary ">Email address

<!-- svelte-ignore a11y-click-events-have-key-events -->
<div
Expand All @@ -63,7 +63,7 @@

<div class="flex gap-2 newMember content-fit">
{#each newMembers as member}
<p class="bg-theme-dark-primary rounded-lg px-1 text-theme-dark-white hoverClass">{member}</p>
<p class="bg-theme-dark-primary rounded-lg px-1 mt-2 text-theme-dark-white hoverClass">{member}</p>
{/each}
<p class="bg-theme-dark-primary rounded-lg px-1 text-theme-dark-white hoverClass"> tester@gmail.com </p>

Expand All @@ -76,15 +76,15 @@
href="#/installGuide"
>
<Button
class="bg-theme-dark-primary w-2/3 text-theme-dark-white"
class="bg-theme-dark-primary mt-4 w-2/3 text-theme-dark-white"
rounded
block on:click={sendEmails}>Send Invites</Button
>
</a>
</div>
<!-- TODO: Link the skip button to next page -->
<div class="ml-96 pl-6 text-theme-dark-white pt-2 rounded">
<Button on:click={goToGallery} class="rounded">Skip Step</Button>
<Button on:click={goToTutorial} class="rounded">Skip Step</Button>
</div>
</div>
<!-- </MaterialApp> -->
Expand Down
2 changes: 1 addition & 1 deletion Desktop/src/components/ModelsCard.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<div class="cursor-pointer relative grid rounded-lg grid-cols-8 gap-0 flex p-4 shadow-lg background-card w-72 h-96"
on:click={handleClick}
on:mouseenter={handleHover}>
<div class="texto col-span-1 transform rotate-180 ">
<div class="texto col-span-1 transform rotate-180 text-dark-primary">
{Model.mDescription}
</div>
<div class="flex col-span-7 flex-col justify-center w-full h-full">
Expand Down
10 changes: 5 additions & 5 deletions Desktop/src/components/ModelsCardContent.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@

<!-- Model Name and Description -->
<div class="flex flex-col p-4 col-span-1 row-span-1">
<div class="text-2xl text-theme-dark-lightText font-bold justify-center ">{Model.mName}</div>
<div class=" text-theme-dark-lightText text-base">{Model.mDescription}</div>
<div class="align-right font-bold text-theme-dark justify-right mt-2 text-lg "> Version: {Model.mVersion}</div>
<div class="text-2xl text-dark-primary font-bold justify-center ">{Model.mName}</div>
<div class=" text-theme-dark-white text-base">{Model.mDescription}</div>
<div class="align-right font-bold text-theme-dark-white justify-right mt-2 text-lg "> Version: {Model.mVersion}</div>
</div>

<!-- Placeholder for Dashboard -->
<div class="text-theme-dark bg-theme-dark-primary rounded-lg flex items-center justify-center col-span-1 row-span-3">
<span>placeholder for dashboard {Model.mName}</span>
<span>placeholder for {Model.mName} dashboard </span>
</div>

<!-- Summary -->
<div class="text-theme-dark p-4 text-xl col-span-1 row-span-2">
<div class="text-white p-4 text-xl col-span-1 row-span-2">
{Model.mSummary}
</div>
</div>
Expand Down
Loading