From a13678d98fa5257c11dfce02c6cace55276a0412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Wo=C5=BAniak?= Date: Tue, 5 Oct 2021 14:34:20 +0200 Subject: [PATCH] X --- .dockerignore | 6 +++--- Cargo.lock | 17 ++++------------- Cargo.toml | 2 +- actors/database-actor/Cargo.toml | 12 ++++++------ actors/database-actor/src/lib.rs | 2 +- jirs-client/scripts/build | 16 ---------------- shared/jirs-data/Cargo.toml | 6 +++--- {jirs-client => web}/.dockerignore | 0 {jirs-client => web}/.env | 0 {jirs-client => web}/.gitignore | 0 {jirs-client => web}/Cargo.toml | 0 {jirs-client => web}/Dockerfile | 0 {jirs-client => web}/LICENSE | 0 {jirs-client => web}/build.rs | 0 {jirs-client => web}/jirs.nginx | 0 {jirs-client => web}/js/css/app.scss | 0 {jirs-client => web}/js/css/aside.scss | 0 .../js/css/deleteIssueStatus.scss | 0 {jirs-client => web}/js/css/epicsPage.scss | 0 {jirs-client => web}/js/css/fonts.scss | 0 {jirs-client => web}/js/css/global.scss | 0 {jirs-client => web}/js/css/iconfonts.scss | 0 {jirs-client => web}/js/css/invite.scss | 0 {jirs-client => web}/js/css/issue.scss | 0 .../js/css/issuesAndFilters.scss | 0 {jirs-client => web}/js/css/login.scss | 0 {jirs-client => web}/js/css/normalize.scss | 0 {jirs-client => web}/js/css/profile.scss | 0 {jirs-client => web}/js/css/project.scss | 0 .../js/css/projectSettings.scss | 0 {jirs-client => web}/js/css/register.scss | 0 {jirs-client => web}/js/css/reports.scss | 0 {jirs-client => web}/js/css/shared.scss | 0 {jirs-client => web}/js/css/sidebar.scss | 0 {jirs-client => web}/js/css/styledAvatar.scss | 0 {jirs-client => web}/js/css/styledButton.scss | 0 .../js/css/styledCheckbox.scss | 0 {jirs-client => web}/js/css/styledComment.scss | 0 .../js/css/styledDateTimeInput.scss | 0 {jirs-client => web}/js/css/styledEditor.scss | 0 {jirs-client => web}/js/css/styledForm.scss | 0 {jirs-client => web}/js/css/styledIcon.scss | 0 .../js/css/styledImageInput.scss | 0 {jirs-client => web}/js/css/styledInput.scss | 0 {jirs-client => web}/js/css/styledLink.scss | 0 {jirs-client => web}/js/css/styledModal.scss | 0 {jirs-client => web}/js/css/styledPage.scss | 0 {jirs-client => web}/js/css/styledRte.scss | 0 {jirs-client => web}/js/css/styledSelect.scss | 0 .../js/css/styledSelectChild.scss | 0 .../js/css/styledTextArea.scss | 0 {jirs-client => web}/js/css/styledTooltip.scss | 0 {jirs-client => web}/js/css/timeTracking.scss | 0 {jirs-client => web}/js/css/users.scss | 0 {jirs-client => web}/js/css/variables.scss | 0 {jirs-client => web}/js/nginx-selfsigned.crt | 0 {jirs-client => web}/js/nginx-selfsigned.key | 0 {jirs-client => web}/js/styles.css | 0 {jirs-client => web}/js/template.ejs | 0 {jirs-client => web}/js/template.html | 0 {jirs-client => web}/scripts/dev.sh | 11 +++++++---- {jirs-client => web}/scripts/prod.sh | 4 ++-- {jirs-client => web}/scripts/run-wasm-pack.sh | 2 +- {jirs-client => web}/src/changes.rs | 0 {jirs-client => web}/src/components/mod.rs | 0 .../src/components/styled_avatar.rs | 0 .../src/components/styled_button.rs | 0 .../src/components/styled_checkbox.rs | 0 .../src/components/styled_confirm_modal.rs | 0 .../src/components/styled_date_time_input.rs | 0 .../src/components/styled_editor.rs | 0 .../src/components/styled_field.rs | 0 .../src/components/styled_form.rs | 0 .../src/components/styled_icon.rs | 0 .../src/components/styled_image_input.rs | 0 .../src/components/styled_input.rs | 0 .../src/components/styled_link.rs | 0 .../src/components/styled_md_editor.rs | 0 .../src/components/styled_modal.rs | 0 .../src/components/styled_rte.rs | 0 .../src/components/styled_select.rs | 0 .../src/components/styled_select_child.rs | 0 .../src/components/styled_textarea.rs | 0 .../src/components/styled_tip.rs | 0 .../src/components/styled_tooltip.rs | 0 {jirs-client => web}/src/fields.rs | 0 {jirs-client => web}/src/images/mod.rs | 0 .../src/images/project_avatar.rs | 0 {jirs-client => web}/src/lib.rs | 0 web/src/location.rs | 14 ++++++++++++++ .../src/modals/comments_delete/mod.rs | 0 .../src/modals/comments_delete/model.rs | 0 .../src/modals/comments_delete/view.rs | 0 {jirs-client => web}/src/modals/debug/mod.rs | 0 {jirs-client => web}/src/modals/debug/model.rs | 0 .../src/modals/debug/update.rs | 0 {jirs-client => web}/src/modals/debug/view.rs | 0 {jirs-client => web}/src/modals/epic_field.rs | 0 .../src/modals/epics_delete/mod.rs | 0 .../src/modals/epics_delete/model.rs | 0 .../src/modals/epics_delete/update.rs | 0 .../src/modals/epics_delete/view.rs | 0 .../src/modals/epics_edit/mod.rs | 0 .../src/modals/epics_edit/model.rs | 0 .../src/modals/epics_edit/update.rs | 0 .../src/modals/epics_edit/view.rs | 0 .../src/modals/issue_statuses_delete/mod.rs | 0 .../src/modals/issue_statuses_delete/model.rs | 0 .../src/modals/issue_statuses_delete/update.rs | 0 .../src/modals/issue_statuses_delete/view.rs | 0 .../src/modals/issues_create/mod.rs | 0 .../src/modals/issues_create/model.rs | 0 .../src/modals/issues_create/update.rs | 0 .../src/modals/issues_create/view.rs | 0 .../src/modals/issues_delete/mod.rs | 0 .../src/modals/issues_delete/model.rs | 0 .../src/modals/issues_delete/update.rs | 0 .../src/modals/issues_delete/view.rs | 0 .../src/modals/issues_edit/mod.rs | 0 .../src/modals/issues_edit/model.rs | 0 .../src/modals/issues_edit/update.rs | 0 .../src/modals/issues_edit/view.rs | 0 .../src/modals/issues_edit/view/comments.rs | 0 {jirs-client => web}/src/modals/mod.rs | 0 .../src/modals/time_tracking/mod.rs | 0 .../src/modals/time_tracking/model.rs | 0 .../src/modals/time_tracking/update.rs | 0 .../src/modals/time_tracking/view.rs | 0 {jirs-client => web}/src/modals/update.rs | 0 {jirs-client => web}/src/modals/view.rs | 0 {jirs-client => web}/src/model.rs | 0 .../src/pages/epics_page/mod.rs | 0 .../src/pages/epics_page/model.rs | 0 .../src/pages/epics_page/update.rs | 0 .../src/pages/epics_page/view.rs | 0 .../src/pages/invite_page/mod.rs | 0 .../src/pages/invite_page/model.rs | 0 .../src/pages/invite_page/update.rs | 0 .../src/pages/invite_page/view.rs | 0 .../src/pages/issues_and_filters/mod.rs | 0 .../src/pages/issues_and_filters/model.rs | 0 .../src/pages/issues_and_filters/update.rs | 0 .../src/pages/issues_and_filters/view.rs | 0 .../pages/issues_and_filters/view/filters.rs | 0 .../issues_and_filters/view/issue_info.rs | 0 {jirs-client => web}/src/pages/mod.rs | 0 .../src/pages/profile_page/mod.rs | 0 .../src/pages/profile_page/model.rs | 0 .../src/pages/profile_page/update.rs | 0 .../src/pages/profile_page/view.rs | 0 .../src/pages/project_page/mod.rs | 0 .../src/pages/project_page/model.rs | 0 .../src/pages/project_page/update.rs | 0 .../src/pages/project_page/view.rs | 0 .../src/pages/project_page/view/board.rs | 0 .../src/pages/project_page/view/filters.rs | 0 .../src/pages/project_settings_page/mod.rs | 0 .../src/pages/project_settings_page/model.rs | 0 .../time_tracking_fibonacci.txt | 0 .../time_tracking_hourly.txt | 0 .../src/pages/project_settings_page/update.rs | 0 .../src/pages/project_settings_page/view.rs | 0 .../src/pages/reports_page/mod.rs | 0 .../src/pages/reports_page/model.rs | 0 .../src/pages/reports_page/update.rs | 0 .../src/pages/reports_page/view.rs | 0 .../src/pages/sign_in_page/mod.rs | 0 .../src/pages/sign_in_page/model.rs | 0 .../src/pages/sign_in_page/update.rs | 0 .../src/pages/sign_in_page/view.rs | 0 .../src/pages/sign_up_page/mod.rs | 0 .../src/pages/sign_up_page/model.rs | 0 .../src/pages/sign_up_page/update.rs | 0 .../src/pages/sign_up_page/view.rs | 0 .../src/pages/users_page/mod.rs | 0 .../src/pages/users_page/model.rs | 0 .../src/pages/users_page/update.rs | 0 .../src/pages/users_page/view.rs | 0 {jirs-client => web}/src/shared/aside.rs | 0 {jirs-client => web}/src/shared/drag.rs | 0 {jirs-client => web}/src/shared/mod.rs | 0 {jirs-client => web}/src/shared/navbar_left.rs | 0 {jirs-client => web}/src/shared/on_event.rs | 0 .../src/shared/tracking_widget.rs | 0 {jirs-client => web}/src/shared/validate.rs | 0 {jirs-client => web}/src/validations.rs | 0 {jirs-client => web}/src/ws/init_load_sets.rs | 0 {jirs-client => web}/src/ws/issue.rs | 0 {jirs-client => web}/src/ws/mod.rs | 0 {jirs-client => web}/static/favicon.png | Bin {jirs-client => web}/static/feedback.png | Bin .../static/fonts/CircularStd-Black.eot | Bin .../static/fonts/CircularStd-Black.otf | Bin .../static/fonts/CircularStd-Black.svg | 0 .../static/fonts/CircularStd-Black.ttf | Bin .../static/fonts/CircularStd-Black.woff | Bin .../static/fonts/CircularStd-Black.woff2 | Bin .../static/fonts/CircularStd-Bold.eot | Bin .../static/fonts/CircularStd-Bold.otf | Bin .../static/fonts/CircularStd-Bold.svg | 0 .../static/fonts/CircularStd-Bold.ttf | Bin .../static/fonts/CircularStd-Bold.woff | Bin .../static/fonts/CircularStd-Bold.woff2 | Bin .../static/fonts/CircularStd-Book.eot | Bin .../static/fonts/CircularStd-Book.otf | Bin .../static/fonts/CircularStd-Book.svg | 0 .../static/fonts/CircularStd-Book.ttf | Bin .../static/fonts/CircularStd-Book.woff | Bin .../static/fonts/CircularStd-Book.woff2 | Bin .../static/fonts/CircularStd-Medium.eot | Bin .../static/fonts/CircularStd-Medium.otf | Bin .../static/fonts/CircularStd-Medium.svg | 0 .../static/fonts/CircularStd-Medium.ttf | Bin .../static/fonts/CircularStd-Medium.woff | Bin .../static/fonts/CircularStd-Medium.woff2 | Bin {jirs-client => web}/static/fonts/icofont.eot | Bin {jirs-client => web}/static/fonts/icofont.svg | 0 {jirs-client => web}/static/fonts/icofont.ttf | Bin {jirs-client => web}/static/fonts/icofont.woff | Bin .../static/fonts/icofont.woff2 | Bin {jirs-client => web}/static/fonts/jira.svg | 0 {jirs-client => web}/static/fonts/jira.ttf | Bin {jirs-client => web}/static/fonts/jira.woff | Bin {jirs-client => web}/static/index.js | 0 {jirs-client => web}/static/logo.svg | 0 {jirs-client => web}/static/logo2.svg | 0 {jirs-client => web}/static/project-avatar.svg | 0 {jirs-client => web}/static/project-icon.svg | 0 {jirs-client => web}/tests/wasm.rs | 0 229 files changed, 42 insertions(+), 50 deletions(-) delete mode 100755 jirs-client/scripts/build rename {jirs-client => web}/.dockerignore (100%) rename {jirs-client => web}/.env (100%) rename {jirs-client => web}/.gitignore (100%) rename {jirs-client => web}/Cargo.toml (100%) rename {jirs-client => web}/Dockerfile (100%) rename {jirs-client => web}/LICENSE (100%) rename {jirs-client => web}/build.rs (100%) rename {jirs-client => web}/jirs.nginx (100%) rename {jirs-client => web}/js/css/app.scss (100%) rename {jirs-client => web}/js/css/aside.scss (100%) rename {jirs-client => web}/js/css/deleteIssueStatus.scss (100%) rename {jirs-client => web}/js/css/epicsPage.scss (100%) rename {jirs-client => web}/js/css/fonts.scss (100%) rename {jirs-client => web}/js/css/global.scss (100%) rename {jirs-client => web}/js/css/iconfonts.scss (100%) rename {jirs-client => web}/js/css/invite.scss (100%) rename {jirs-client => web}/js/css/issue.scss (100%) rename {jirs-client => web}/js/css/issuesAndFilters.scss (100%) rename {jirs-client => web}/js/css/login.scss (100%) rename {jirs-client => web}/js/css/normalize.scss (100%) rename {jirs-client => web}/js/css/profile.scss (100%) rename {jirs-client => web}/js/css/project.scss (100%) rename {jirs-client => web}/js/css/projectSettings.scss (100%) rename {jirs-client => web}/js/css/register.scss (100%) rename {jirs-client => web}/js/css/reports.scss (100%) rename {jirs-client => web}/js/css/shared.scss (100%) rename {jirs-client => web}/js/css/sidebar.scss (100%) rename {jirs-client => web}/js/css/styledAvatar.scss (100%) rename {jirs-client => web}/js/css/styledButton.scss (100%) rename {jirs-client => web}/js/css/styledCheckbox.scss (100%) rename {jirs-client => web}/js/css/styledComment.scss (100%) rename {jirs-client => web}/js/css/styledDateTimeInput.scss (100%) rename {jirs-client => web}/js/css/styledEditor.scss (100%) rename {jirs-client => web}/js/css/styledForm.scss (100%) rename {jirs-client => web}/js/css/styledIcon.scss (100%) rename {jirs-client => web}/js/css/styledImageInput.scss (100%) rename {jirs-client => web}/js/css/styledInput.scss (100%) rename {jirs-client => web}/js/css/styledLink.scss (100%) rename {jirs-client => web}/js/css/styledModal.scss (100%) rename {jirs-client => web}/js/css/styledPage.scss (100%) rename {jirs-client => web}/js/css/styledRte.scss (100%) rename {jirs-client => web}/js/css/styledSelect.scss (100%) rename {jirs-client => web}/js/css/styledSelectChild.scss (100%) rename {jirs-client => web}/js/css/styledTextArea.scss (100%) rename {jirs-client => web}/js/css/styledTooltip.scss (100%) rename {jirs-client => web}/js/css/timeTracking.scss (100%) rename {jirs-client => web}/js/css/users.scss (100%) rename {jirs-client => web}/js/css/variables.scss (100%) rename {jirs-client => web}/js/nginx-selfsigned.crt (100%) rename {jirs-client => web}/js/nginx-selfsigned.key (100%) rename {jirs-client => web}/js/styles.css (100%) rename {jirs-client => web}/js/template.ejs (100%) rename {jirs-client => web}/js/template.html (100%) rename {jirs-client => web}/scripts/dev.sh (76%) rename {jirs-client => web}/scripts/prod.sh (85%) rename {jirs-client => web}/scripts/run-wasm-pack.sh (84%) rename {jirs-client => web}/src/changes.rs (100%) rename {jirs-client => web}/src/components/mod.rs (100%) rename {jirs-client => web}/src/components/styled_avatar.rs (100%) rename {jirs-client => web}/src/components/styled_button.rs (100%) rename {jirs-client => web}/src/components/styled_checkbox.rs (100%) rename {jirs-client => web}/src/components/styled_confirm_modal.rs (100%) rename {jirs-client => web}/src/components/styled_date_time_input.rs (100%) rename {jirs-client => web}/src/components/styled_editor.rs (100%) rename {jirs-client => web}/src/components/styled_field.rs (100%) rename {jirs-client => web}/src/components/styled_form.rs (100%) rename {jirs-client => web}/src/components/styled_icon.rs (100%) rename {jirs-client => web}/src/components/styled_image_input.rs (100%) rename {jirs-client => web}/src/components/styled_input.rs (100%) rename {jirs-client => web}/src/components/styled_link.rs (100%) rename {jirs-client => web}/src/components/styled_md_editor.rs (100%) rename {jirs-client => web}/src/components/styled_modal.rs (100%) rename {jirs-client => web}/src/components/styled_rte.rs (100%) rename {jirs-client => web}/src/components/styled_select.rs (100%) rename {jirs-client => web}/src/components/styled_select_child.rs (100%) rename {jirs-client => web}/src/components/styled_textarea.rs (100%) rename {jirs-client => web}/src/components/styled_tip.rs (100%) rename {jirs-client => web}/src/components/styled_tooltip.rs (100%) rename {jirs-client => web}/src/fields.rs (100%) rename {jirs-client => web}/src/images/mod.rs (100%) rename {jirs-client => web}/src/images/project_avatar.rs (100%) rename {jirs-client => web}/src/lib.rs (100%) create mode 100644 web/src/location.rs rename {jirs-client => web}/src/modals/comments_delete/mod.rs (100%) rename {jirs-client => web}/src/modals/comments_delete/model.rs (100%) rename {jirs-client => web}/src/modals/comments_delete/view.rs (100%) rename {jirs-client => web}/src/modals/debug/mod.rs (100%) rename {jirs-client => web}/src/modals/debug/model.rs (100%) rename {jirs-client => web}/src/modals/debug/update.rs (100%) rename {jirs-client => web}/src/modals/debug/view.rs (100%) rename {jirs-client => web}/src/modals/epic_field.rs (100%) rename {jirs-client => web}/src/modals/epics_delete/mod.rs (100%) rename {jirs-client => web}/src/modals/epics_delete/model.rs (100%) rename {jirs-client => web}/src/modals/epics_delete/update.rs (100%) rename {jirs-client => web}/src/modals/epics_delete/view.rs (100%) rename {jirs-client => web}/src/modals/epics_edit/mod.rs (100%) rename {jirs-client => web}/src/modals/epics_edit/model.rs (100%) rename {jirs-client => web}/src/modals/epics_edit/update.rs (100%) rename {jirs-client => web}/src/modals/epics_edit/view.rs (100%) rename {jirs-client => web}/src/modals/issue_statuses_delete/mod.rs (100%) rename {jirs-client => web}/src/modals/issue_statuses_delete/model.rs (100%) rename {jirs-client => web}/src/modals/issue_statuses_delete/update.rs (100%) rename {jirs-client => web}/src/modals/issue_statuses_delete/view.rs (100%) rename {jirs-client => web}/src/modals/issues_create/mod.rs (100%) rename {jirs-client => web}/src/modals/issues_create/model.rs (100%) rename {jirs-client => web}/src/modals/issues_create/update.rs (100%) rename {jirs-client => web}/src/modals/issues_create/view.rs (100%) rename {jirs-client => web}/src/modals/issues_delete/mod.rs (100%) rename {jirs-client => web}/src/modals/issues_delete/model.rs (100%) rename {jirs-client => web}/src/modals/issues_delete/update.rs (100%) rename {jirs-client => web}/src/modals/issues_delete/view.rs (100%) rename {jirs-client => web}/src/modals/issues_edit/mod.rs (100%) rename {jirs-client => web}/src/modals/issues_edit/model.rs (100%) rename {jirs-client => web}/src/modals/issues_edit/update.rs (100%) rename {jirs-client => web}/src/modals/issues_edit/view.rs (100%) rename {jirs-client => web}/src/modals/issues_edit/view/comments.rs (100%) rename {jirs-client => web}/src/modals/mod.rs (100%) rename {jirs-client => web}/src/modals/time_tracking/mod.rs (100%) rename {jirs-client => web}/src/modals/time_tracking/model.rs (100%) rename {jirs-client => web}/src/modals/time_tracking/update.rs (100%) rename {jirs-client => web}/src/modals/time_tracking/view.rs (100%) rename {jirs-client => web}/src/modals/update.rs (100%) rename {jirs-client => web}/src/modals/view.rs (100%) rename {jirs-client => web}/src/model.rs (100%) rename {jirs-client => web}/src/pages/epics_page/mod.rs (100%) rename {jirs-client => web}/src/pages/epics_page/model.rs (100%) rename {jirs-client => web}/src/pages/epics_page/update.rs (100%) rename {jirs-client => web}/src/pages/epics_page/view.rs (100%) rename {jirs-client => web}/src/pages/invite_page/mod.rs (100%) rename {jirs-client => web}/src/pages/invite_page/model.rs (100%) rename {jirs-client => web}/src/pages/invite_page/update.rs (100%) rename {jirs-client => web}/src/pages/invite_page/view.rs (100%) rename {jirs-client => web}/src/pages/issues_and_filters/mod.rs (100%) rename {jirs-client => web}/src/pages/issues_and_filters/model.rs (100%) rename {jirs-client => web}/src/pages/issues_and_filters/update.rs (100%) rename {jirs-client => web}/src/pages/issues_and_filters/view.rs (100%) rename {jirs-client => web}/src/pages/issues_and_filters/view/filters.rs (100%) rename {jirs-client => web}/src/pages/issues_and_filters/view/issue_info.rs (100%) rename {jirs-client => web}/src/pages/mod.rs (100%) rename {jirs-client => web}/src/pages/profile_page/mod.rs (100%) rename {jirs-client => web}/src/pages/profile_page/model.rs (100%) rename {jirs-client => web}/src/pages/profile_page/update.rs (100%) rename {jirs-client => web}/src/pages/profile_page/view.rs (100%) rename {jirs-client => web}/src/pages/project_page/mod.rs (100%) rename {jirs-client => web}/src/pages/project_page/model.rs (100%) rename {jirs-client => web}/src/pages/project_page/update.rs (100%) rename {jirs-client => web}/src/pages/project_page/view.rs (100%) rename {jirs-client => web}/src/pages/project_page/view/board.rs (100%) rename {jirs-client => web}/src/pages/project_page/view/filters.rs (100%) rename {jirs-client => web}/src/pages/project_settings_page/mod.rs (100%) rename {jirs-client => web}/src/pages/project_settings_page/model.rs (100%) rename {jirs-client => web}/src/pages/project_settings_page/time_tracking_fibonacci.txt (100%) rename {jirs-client => web}/src/pages/project_settings_page/time_tracking_hourly.txt (100%) rename {jirs-client => web}/src/pages/project_settings_page/update.rs (100%) rename {jirs-client => web}/src/pages/project_settings_page/view.rs (100%) rename {jirs-client => web}/src/pages/reports_page/mod.rs (100%) rename {jirs-client => web}/src/pages/reports_page/model.rs (100%) rename {jirs-client => web}/src/pages/reports_page/update.rs (100%) rename {jirs-client => web}/src/pages/reports_page/view.rs (100%) rename {jirs-client => web}/src/pages/sign_in_page/mod.rs (100%) rename {jirs-client => web}/src/pages/sign_in_page/model.rs (100%) rename {jirs-client => web}/src/pages/sign_in_page/update.rs (100%) rename {jirs-client => web}/src/pages/sign_in_page/view.rs (100%) rename {jirs-client => web}/src/pages/sign_up_page/mod.rs (100%) rename {jirs-client => web}/src/pages/sign_up_page/model.rs (100%) rename {jirs-client => web}/src/pages/sign_up_page/update.rs (100%) rename {jirs-client => web}/src/pages/sign_up_page/view.rs (100%) rename {jirs-client => web}/src/pages/users_page/mod.rs (100%) rename {jirs-client => web}/src/pages/users_page/model.rs (100%) rename {jirs-client => web}/src/pages/users_page/update.rs (100%) rename {jirs-client => web}/src/pages/users_page/view.rs (100%) rename {jirs-client => web}/src/shared/aside.rs (100%) rename {jirs-client => web}/src/shared/drag.rs (100%) rename {jirs-client => web}/src/shared/mod.rs (100%) rename {jirs-client => web}/src/shared/navbar_left.rs (100%) rename {jirs-client => web}/src/shared/on_event.rs (100%) rename {jirs-client => web}/src/shared/tracking_widget.rs (100%) rename {jirs-client => web}/src/shared/validate.rs (100%) rename {jirs-client => web}/src/validations.rs (100%) rename {jirs-client => web}/src/ws/init_load_sets.rs (100%) rename {jirs-client => web}/src/ws/issue.rs (100%) rename {jirs-client => web}/src/ws/mod.rs (100%) rename {jirs-client => web}/static/favicon.png (100%) rename {jirs-client => web}/static/feedback.png (100%) rename {jirs-client => web}/static/fonts/CircularStd-Black.eot (100%) rename {jirs-client => web}/static/fonts/CircularStd-Black.otf (100%) rename {jirs-client => web}/static/fonts/CircularStd-Black.svg (100%) rename {jirs-client => web}/static/fonts/CircularStd-Black.ttf (100%) rename {jirs-client => web}/static/fonts/CircularStd-Black.woff (100%) rename {jirs-client => web}/static/fonts/CircularStd-Black.woff2 (100%) rename {jirs-client => web}/static/fonts/CircularStd-Bold.eot (100%) rename {jirs-client => web}/static/fonts/CircularStd-Bold.otf (100%) rename {jirs-client => web}/static/fonts/CircularStd-Bold.svg (100%) rename {jirs-client => web}/static/fonts/CircularStd-Bold.ttf (100%) rename {jirs-client => web}/static/fonts/CircularStd-Bold.woff (100%) rename {jirs-client => web}/static/fonts/CircularStd-Bold.woff2 (100%) rename {jirs-client => web}/static/fonts/CircularStd-Book.eot (100%) rename {jirs-client => web}/static/fonts/CircularStd-Book.otf (100%) rename {jirs-client => web}/static/fonts/CircularStd-Book.svg (100%) rename {jirs-client => web}/static/fonts/CircularStd-Book.ttf (100%) rename {jirs-client => web}/static/fonts/CircularStd-Book.woff (100%) rename {jirs-client => web}/static/fonts/CircularStd-Book.woff2 (100%) rename {jirs-client => web}/static/fonts/CircularStd-Medium.eot (100%) rename {jirs-client => web}/static/fonts/CircularStd-Medium.otf (100%) rename {jirs-client => web}/static/fonts/CircularStd-Medium.svg (100%) rename {jirs-client => web}/static/fonts/CircularStd-Medium.ttf (100%) rename {jirs-client => web}/static/fonts/CircularStd-Medium.woff (100%) rename {jirs-client => web}/static/fonts/CircularStd-Medium.woff2 (100%) rename {jirs-client => web}/static/fonts/icofont.eot (100%) rename {jirs-client => web}/static/fonts/icofont.svg (100%) rename {jirs-client => web}/static/fonts/icofont.ttf (100%) rename {jirs-client => web}/static/fonts/icofont.woff (100%) rename {jirs-client => web}/static/fonts/icofont.woff2 (100%) rename {jirs-client => web}/static/fonts/jira.svg (100%) rename {jirs-client => web}/static/fonts/jira.ttf (100%) rename {jirs-client => web}/static/fonts/jira.woff (100%) rename {jirs-client => web}/static/index.js (100%) rename {jirs-client => web}/static/logo.svg (100%) rename {jirs-client => web}/static/logo2.svg (100%) rename {jirs-client => web}/static/project-avatar.svg (100%) rename {jirs-client => web}/static/project-icon.svg (100%) rename {jirs-client => web}/tests/wasm.rs (100%) diff --git a/.dockerignore b/.dockerignore index fff88fed..eb35b372 100644 --- a/.dockerignore +++ b/.dockerignore @@ -82,9 +82,9 @@ fabric.properties /tmp/ -/jirs-client/target/ -/jirs-client/tmp/ -/jirs-client/build/ +/web/target/ +/web/tmp/ +/web/build/ /jirs-server/target/ /jirs-server/tmp/ diff --git a/Cargo.lock b/Cargo.lock index 88e2b181..c103abfe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -527,9 +527,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da1976d75adbe5fbc88130ecd119529cf1cc6a93ae1546d8696ee66f0d21af1" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" @@ -857,7 +857,7 @@ dependencies = [ "diesel", "dotenv", "futures", - "ipnetwork 0.16.0", + "ipnetwork", "jirs-config", "jirs-data", "libc", @@ -924,7 +924,7 @@ dependencies = [ "byteorder", "chrono", "diesel_derives", - "ipnetwork 0.18.0", + "ipnetwork", "libc", "num-bigint", "num-integer", @@ -1670,15 +1670,6 @@ dependencies = [ "serde", ] -[[package]] -name = "ipnetwork" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4088d739b183546b239688ddbc79891831df421773df95e236daf7867866d355" -dependencies = [ - "serde", -] - [[package]] name = "itertools" version = "0.9.0" diff --git a/Cargo.toml b/Cargo.toml index 9572c657..11e7483c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,5 +27,5 @@ members = [ "./actors/amazon-actor", "./actors/filesystem-actor", # Client - "./jirs-client" + "./web" ] diff --git a/actors/database-actor/Cargo.toml b/actors/database-actor/Cargo.toml index 11ef3d7b..c9e8a574 100644 --- a/actors/database-actor/Cargo.toml +++ b/actors/database-actor/Cargo.toml @@ -16,8 +16,8 @@ path = "./src/lib.rs" common = { path = "../../shared/common" } actix = { version = "0.10.0" } -serde = "*" -bincode = "*" +serde = { version = "*" } +bincode = { version = "*" } toml = { version = "*" } futures = { version = "0.3.8" } @@ -29,12 +29,12 @@ r2d2 = { version = ">= 0.8, < 0.9" } dotenv = { version = "*" } -byteorder = "1.0" +byteorder = { version = "1.0" } chrono = { version = "0.4", features = ["serde"] } time = { version = "0.1" } url = { version = "2.1.0" } percent-encoding = { version = "2.1.0" } -uuid = { version = "0.8.1", features = ["serde", "v4", "v5"] } +uuid = { version = "0.8.2", features = ["serde", "v4", "v5"] } ipnetwork = { version = ">=0.12.2, <0.17.0" } num-bigint = { version = ">=0.1.41, <0.3" } num-traits = { version = "0.2" } @@ -54,5 +54,5 @@ features = ["backend"] path = "../../derive/derive_db_execute" [dependencies.diesel] -version = "*" -features = ["unstable", "postgres", "numeric", "extras", "uuidv07"] +version = "1.4.7" +features = [ "postgres", "numeric", "uuidv07", "r2d2", "extras" ] diff --git a/actors/database-actor/src/lib.rs b/actors/database-actor/src/lib.rs index cfda5424..0bbb3eee 100644 --- a/actors/database-actor/src/lib.rs +++ b/actors/database-actor/src/lib.rs @@ -51,7 +51,7 @@ pub fn build_pool() -> DbPool { dotenv::dotenv().ok(); let config = jirs_config::database::Configuration::read(); - let manager = ConnectionManager::::new(config.database_url); + let manager = ConnectionManager::::new(&config.database_url); r2d2::Pool::builder() .max_size(config.concurrency as u32) .build(manager) diff --git a/jirs-client/scripts/build b/jirs-client/scripts/build deleted file mode 100755 index 7c9585a4..00000000 --- a/jirs-client/scripts/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -export NODE_ENV=production - -rm -Rf dist -mkdir -p dist - -cp -R ./dev/* ./dist -yarn svgo -r -o ./dist/ -f ./static -yarn svgo -r -o ./dist/ -f ./js -yarn svgo -r -o ./dist/ -f ./dev - -for f in $(ls {js,static,dev}/*.png); do - yarn optipng -dir ./dist -o7 ${f} -done -NODE_ENV=production RUST_LOG=error yarn webpack diff --git a/shared/jirs-data/Cargo.toml b/shared/jirs-data/Cargo.toml index dc611df5..58c160aa 100644 --- a/shared/jirs-data/Cargo.toml +++ b/shared/jirs-data/Cargo.toml @@ -20,16 +20,16 @@ frontend = [] serde = { version = "*" } serde_json = { version = "*" } chrono = { version = "*", features = ["serde"] } -uuid = { version = ">=0.7.0, <0.9.0", features = ["serde"] } +uuid = { version = "0.8.2", features = ["serde"] } [dependencies.actix] version = "0.10.0" optional = true [dependencies.diesel] +version = "1.4.7" +features = [ "postgres", "numeric", "uuidv07", "r2d2" ] optional = true -version = "*" -features = ["unstable", "postgres", "numeric", "extras", "uuidv07"] [dependencies.derive_enum_iter] path = "../../derive/derive_enum_iter" diff --git a/jirs-client/.dockerignore b/web/.dockerignore similarity index 100% rename from jirs-client/.dockerignore rename to web/.dockerignore diff --git a/jirs-client/.env b/web/.env similarity index 100% rename from jirs-client/.env rename to web/.env diff --git a/jirs-client/.gitignore b/web/.gitignore similarity index 100% rename from jirs-client/.gitignore rename to web/.gitignore diff --git a/jirs-client/Cargo.toml b/web/Cargo.toml similarity index 100% rename from jirs-client/Cargo.toml rename to web/Cargo.toml diff --git a/jirs-client/Dockerfile b/web/Dockerfile similarity index 100% rename from jirs-client/Dockerfile rename to web/Dockerfile diff --git a/jirs-client/LICENSE b/web/LICENSE similarity index 100% rename from jirs-client/LICENSE rename to web/LICENSE diff --git a/jirs-client/build.rs b/web/build.rs similarity index 100% rename from jirs-client/build.rs rename to web/build.rs diff --git a/jirs-client/jirs.nginx b/web/jirs.nginx similarity index 100% rename from jirs-client/jirs.nginx rename to web/jirs.nginx diff --git a/jirs-client/js/css/app.scss b/web/js/css/app.scss similarity index 100% rename from jirs-client/js/css/app.scss rename to web/js/css/app.scss diff --git a/jirs-client/js/css/aside.scss b/web/js/css/aside.scss similarity index 100% rename from jirs-client/js/css/aside.scss rename to web/js/css/aside.scss diff --git a/jirs-client/js/css/deleteIssueStatus.scss b/web/js/css/deleteIssueStatus.scss similarity index 100% rename from jirs-client/js/css/deleteIssueStatus.scss rename to web/js/css/deleteIssueStatus.scss diff --git a/jirs-client/js/css/epicsPage.scss b/web/js/css/epicsPage.scss similarity index 100% rename from jirs-client/js/css/epicsPage.scss rename to web/js/css/epicsPage.scss diff --git a/jirs-client/js/css/fonts.scss b/web/js/css/fonts.scss similarity index 100% rename from jirs-client/js/css/fonts.scss rename to web/js/css/fonts.scss diff --git a/jirs-client/js/css/global.scss b/web/js/css/global.scss similarity index 100% rename from jirs-client/js/css/global.scss rename to web/js/css/global.scss diff --git a/jirs-client/js/css/iconfonts.scss b/web/js/css/iconfonts.scss similarity index 100% rename from jirs-client/js/css/iconfonts.scss rename to web/js/css/iconfonts.scss diff --git a/jirs-client/js/css/invite.scss b/web/js/css/invite.scss similarity index 100% rename from jirs-client/js/css/invite.scss rename to web/js/css/invite.scss diff --git a/jirs-client/js/css/issue.scss b/web/js/css/issue.scss similarity index 100% rename from jirs-client/js/css/issue.scss rename to web/js/css/issue.scss diff --git a/jirs-client/js/css/issuesAndFilters.scss b/web/js/css/issuesAndFilters.scss similarity index 100% rename from jirs-client/js/css/issuesAndFilters.scss rename to web/js/css/issuesAndFilters.scss diff --git a/jirs-client/js/css/login.scss b/web/js/css/login.scss similarity index 100% rename from jirs-client/js/css/login.scss rename to web/js/css/login.scss diff --git a/jirs-client/js/css/normalize.scss b/web/js/css/normalize.scss similarity index 100% rename from jirs-client/js/css/normalize.scss rename to web/js/css/normalize.scss diff --git a/jirs-client/js/css/profile.scss b/web/js/css/profile.scss similarity index 100% rename from jirs-client/js/css/profile.scss rename to web/js/css/profile.scss diff --git a/jirs-client/js/css/project.scss b/web/js/css/project.scss similarity index 100% rename from jirs-client/js/css/project.scss rename to web/js/css/project.scss diff --git a/jirs-client/js/css/projectSettings.scss b/web/js/css/projectSettings.scss similarity index 100% rename from jirs-client/js/css/projectSettings.scss rename to web/js/css/projectSettings.scss diff --git a/jirs-client/js/css/register.scss b/web/js/css/register.scss similarity index 100% rename from jirs-client/js/css/register.scss rename to web/js/css/register.scss diff --git a/jirs-client/js/css/reports.scss b/web/js/css/reports.scss similarity index 100% rename from jirs-client/js/css/reports.scss rename to web/js/css/reports.scss diff --git a/jirs-client/js/css/shared.scss b/web/js/css/shared.scss similarity index 100% rename from jirs-client/js/css/shared.scss rename to web/js/css/shared.scss diff --git a/jirs-client/js/css/sidebar.scss b/web/js/css/sidebar.scss similarity index 100% rename from jirs-client/js/css/sidebar.scss rename to web/js/css/sidebar.scss diff --git a/jirs-client/js/css/styledAvatar.scss b/web/js/css/styledAvatar.scss similarity index 100% rename from jirs-client/js/css/styledAvatar.scss rename to web/js/css/styledAvatar.scss diff --git a/jirs-client/js/css/styledButton.scss b/web/js/css/styledButton.scss similarity index 100% rename from jirs-client/js/css/styledButton.scss rename to web/js/css/styledButton.scss diff --git a/jirs-client/js/css/styledCheckbox.scss b/web/js/css/styledCheckbox.scss similarity index 100% rename from jirs-client/js/css/styledCheckbox.scss rename to web/js/css/styledCheckbox.scss diff --git a/jirs-client/js/css/styledComment.scss b/web/js/css/styledComment.scss similarity index 100% rename from jirs-client/js/css/styledComment.scss rename to web/js/css/styledComment.scss diff --git a/jirs-client/js/css/styledDateTimeInput.scss b/web/js/css/styledDateTimeInput.scss similarity index 100% rename from jirs-client/js/css/styledDateTimeInput.scss rename to web/js/css/styledDateTimeInput.scss diff --git a/jirs-client/js/css/styledEditor.scss b/web/js/css/styledEditor.scss similarity index 100% rename from jirs-client/js/css/styledEditor.scss rename to web/js/css/styledEditor.scss diff --git a/jirs-client/js/css/styledForm.scss b/web/js/css/styledForm.scss similarity index 100% rename from jirs-client/js/css/styledForm.scss rename to web/js/css/styledForm.scss diff --git a/jirs-client/js/css/styledIcon.scss b/web/js/css/styledIcon.scss similarity index 100% rename from jirs-client/js/css/styledIcon.scss rename to web/js/css/styledIcon.scss diff --git a/jirs-client/js/css/styledImageInput.scss b/web/js/css/styledImageInput.scss similarity index 100% rename from jirs-client/js/css/styledImageInput.scss rename to web/js/css/styledImageInput.scss diff --git a/jirs-client/js/css/styledInput.scss b/web/js/css/styledInput.scss similarity index 100% rename from jirs-client/js/css/styledInput.scss rename to web/js/css/styledInput.scss diff --git a/jirs-client/js/css/styledLink.scss b/web/js/css/styledLink.scss similarity index 100% rename from jirs-client/js/css/styledLink.scss rename to web/js/css/styledLink.scss diff --git a/jirs-client/js/css/styledModal.scss b/web/js/css/styledModal.scss similarity index 100% rename from jirs-client/js/css/styledModal.scss rename to web/js/css/styledModal.scss diff --git a/jirs-client/js/css/styledPage.scss b/web/js/css/styledPage.scss similarity index 100% rename from jirs-client/js/css/styledPage.scss rename to web/js/css/styledPage.scss diff --git a/jirs-client/js/css/styledRte.scss b/web/js/css/styledRte.scss similarity index 100% rename from jirs-client/js/css/styledRte.scss rename to web/js/css/styledRte.scss diff --git a/jirs-client/js/css/styledSelect.scss b/web/js/css/styledSelect.scss similarity index 100% rename from jirs-client/js/css/styledSelect.scss rename to web/js/css/styledSelect.scss diff --git a/jirs-client/js/css/styledSelectChild.scss b/web/js/css/styledSelectChild.scss similarity index 100% rename from jirs-client/js/css/styledSelectChild.scss rename to web/js/css/styledSelectChild.scss diff --git a/jirs-client/js/css/styledTextArea.scss b/web/js/css/styledTextArea.scss similarity index 100% rename from jirs-client/js/css/styledTextArea.scss rename to web/js/css/styledTextArea.scss diff --git a/jirs-client/js/css/styledTooltip.scss b/web/js/css/styledTooltip.scss similarity index 100% rename from jirs-client/js/css/styledTooltip.scss rename to web/js/css/styledTooltip.scss diff --git a/jirs-client/js/css/timeTracking.scss b/web/js/css/timeTracking.scss similarity index 100% rename from jirs-client/js/css/timeTracking.scss rename to web/js/css/timeTracking.scss diff --git a/jirs-client/js/css/users.scss b/web/js/css/users.scss similarity index 100% rename from jirs-client/js/css/users.scss rename to web/js/css/users.scss diff --git a/jirs-client/js/css/variables.scss b/web/js/css/variables.scss similarity index 100% rename from jirs-client/js/css/variables.scss rename to web/js/css/variables.scss diff --git a/jirs-client/js/nginx-selfsigned.crt b/web/js/nginx-selfsigned.crt similarity index 100% rename from jirs-client/js/nginx-selfsigned.crt rename to web/js/nginx-selfsigned.crt diff --git a/jirs-client/js/nginx-selfsigned.key b/web/js/nginx-selfsigned.key similarity index 100% rename from jirs-client/js/nginx-selfsigned.key rename to web/js/nginx-selfsigned.key diff --git a/jirs-client/js/styles.css b/web/js/styles.css similarity index 100% rename from jirs-client/js/styles.css rename to web/js/styles.css diff --git a/jirs-client/js/template.ejs b/web/js/template.ejs similarity index 100% rename from jirs-client/js/template.ejs rename to web/js/template.ejs diff --git a/jirs-client/js/template.html b/web/js/template.html similarity index 100% rename from jirs-client/js/template.html rename to web/js/template.html diff --git a/jirs-client/scripts/dev.sh b/web/scripts/dev.sh similarity index 76% rename from jirs-client/scripts/dev.sh rename to web/scripts/dev.sh index d34568fd..f7f1061f 100755 --- a/jirs-client/scripts/dev.sh +++ b/web/scripts/dev.sh @@ -11,19 +11,22 @@ if [[ "${WASM_PACK_PATH}" == "" ]]; then fi export PROJECT_ROOT=$(git rev-parse --show-toplevel) -export CLIENT_ROOT=${PROJECT_ROOT}/jirs-client +export CLIENT_ROOT=${PROJECT_ROOT}/web export HI_ROOT=${PROJECT_ROOT}/highlight/jirs-highlight export MODE=force export BUILD_TYPE=--dev +echo $PROJECT_ROOT +echo $CLIENT_ROOT + cd ${CLIENT_ROOT} . .env cargo watch \ - -i ./jirs-client/src/location.rs \ + -i ${CLIENT_ROOT}/src/location.rs \ -s ${CLIENT_ROOT}/scripts/run-wasm-pack.sh \ -w ${CLIENT_ROOT}/src \ -w ${CLIENT_ROOT}/Cargo.toml \ - -w ./static \ - -w js + -w ${CLIENT_ROOT}/static \ + -w ${CLIENT_ROOT}/js diff --git a/jirs-client/scripts/prod.sh b/web/scripts/prod.sh similarity index 85% rename from jirs-client/scripts/prod.sh rename to web/scripts/prod.sh index 3a8b2cc6..c47a4c4e 100755 --- a/jirs-client/scripts/prod.sh +++ b/web/scripts/prod.sh @@ -6,7 +6,7 @@ if [[ "$status" != "0" ]]; then fi export PROJECT_ROOT=$(git rev-parse --show-toplevel) -export CLIENT_ROOT=${PROJECT_ROOT}/jirs-client +export CLIENT_ROOT=${PROJECT_ROOT}/web export HI_ROOT=${PROJECT_ROOT}/highlight/jirs-highlight export MODE=force export BUILD_TYPE=--release @@ -24,7 +24,7 @@ wasm-pack build --mode normal --release --out-name hi --out-dir $CLIENT_ROOT/bui cd $CLIENT_ROOT rm -Rf ${CLIENT_ROOT}/build/styles.css -rsass -t Compressed ${PROJECT_ROOT}/jirs-client/js/styles.css > ${CLIENT_ROOT}/build/styles.css +rsass -t Compressed ${PROJECT_ROOT}/web/js/styles.css > ${CLIENT_ROOT}/build/styles.css cp -r ./static/* ./build cat ./static/index.js | diff --git a/jirs-client/scripts/run-wasm-pack.sh b/web/scripts/run-wasm-pack.sh similarity index 84% rename from jirs-client/scripts/run-wasm-pack.sh rename to web/scripts/run-wasm-pack.sh index b4083109..6c51f92b 100755 --- a/jirs-client/scripts/run-wasm-pack.sh +++ b/web/scripts/run-wasm-pack.sh @@ -13,7 +13,7 @@ wasm-pack --verbose build --mode ${MODE} ${BUILD_TYPE} --out-name jirs --out-dir cd ${CLIENT_ROOT} rm -Rf ${CLIENT_ROOT}/build/styles.css -rsass -t Expanded ${PROJECT_ROOT}/jirs-client/js/styles.css >${CLIENT_ROOT}/tmp/styles.css +rsass -t Expanded ${PROJECT_ROOT}/web/js/styles.css >${CLIENT_ROOT}/tmp/styles.css cp -r ${CLIENT_ROOT}/static/* ${CLIENT_ROOT}/tmp diff --git a/jirs-client/src/changes.rs b/web/src/changes.rs similarity index 100% rename from jirs-client/src/changes.rs rename to web/src/changes.rs diff --git a/jirs-client/src/components/mod.rs b/web/src/components/mod.rs similarity index 100% rename from jirs-client/src/components/mod.rs rename to web/src/components/mod.rs diff --git a/jirs-client/src/components/styled_avatar.rs b/web/src/components/styled_avatar.rs similarity index 100% rename from jirs-client/src/components/styled_avatar.rs rename to web/src/components/styled_avatar.rs diff --git a/jirs-client/src/components/styled_button.rs b/web/src/components/styled_button.rs similarity index 100% rename from jirs-client/src/components/styled_button.rs rename to web/src/components/styled_button.rs diff --git a/jirs-client/src/components/styled_checkbox.rs b/web/src/components/styled_checkbox.rs similarity index 100% rename from jirs-client/src/components/styled_checkbox.rs rename to web/src/components/styled_checkbox.rs diff --git a/jirs-client/src/components/styled_confirm_modal.rs b/web/src/components/styled_confirm_modal.rs similarity index 100% rename from jirs-client/src/components/styled_confirm_modal.rs rename to web/src/components/styled_confirm_modal.rs diff --git a/jirs-client/src/components/styled_date_time_input.rs b/web/src/components/styled_date_time_input.rs similarity index 100% rename from jirs-client/src/components/styled_date_time_input.rs rename to web/src/components/styled_date_time_input.rs diff --git a/jirs-client/src/components/styled_editor.rs b/web/src/components/styled_editor.rs similarity index 100% rename from jirs-client/src/components/styled_editor.rs rename to web/src/components/styled_editor.rs diff --git a/jirs-client/src/components/styled_field.rs b/web/src/components/styled_field.rs similarity index 100% rename from jirs-client/src/components/styled_field.rs rename to web/src/components/styled_field.rs diff --git a/jirs-client/src/components/styled_form.rs b/web/src/components/styled_form.rs similarity index 100% rename from jirs-client/src/components/styled_form.rs rename to web/src/components/styled_form.rs diff --git a/jirs-client/src/components/styled_icon.rs b/web/src/components/styled_icon.rs similarity index 100% rename from jirs-client/src/components/styled_icon.rs rename to web/src/components/styled_icon.rs diff --git a/jirs-client/src/components/styled_image_input.rs b/web/src/components/styled_image_input.rs similarity index 100% rename from jirs-client/src/components/styled_image_input.rs rename to web/src/components/styled_image_input.rs diff --git a/jirs-client/src/components/styled_input.rs b/web/src/components/styled_input.rs similarity index 100% rename from jirs-client/src/components/styled_input.rs rename to web/src/components/styled_input.rs diff --git a/jirs-client/src/components/styled_link.rs b/web/src/components/styled_link.rs similarity index 100% rename from jirs-client/src/components/styled_link.rs rename to web/src/components/styled_link.rs diff --git a/jirs-client/src/components/styled_md_editor.rs b/web/src/components/styled_md_editor.rs similarity index 100% rename from jirs-client/src/components/styled_md_editor.rs rename to web/src/components/styled_md_editor.rs diff --git a/jirs-client/src/components/styled_modal.rs b/web/src/components/styled_modal.rs similarity index 100% rename from jirs-client/src/components/styled_modal.rs rename to web/src/components/styled_modal.rs diff --git a/jirs-client/src/components/styled_rte.rs b/web/src/components/styled_rte.rs similarity index 100% rename from jirs-client/src/components/styled_rte.rs rename to web/src/components/styled_rte.rs diff --git a/jirs-client/src/components/styled_select.rs b/web/src/components/styled_select.rs similarity index 100% rename from jirs-client/src/components/styled_select.rs rename to web/src/components/styled_select.rs diff --git a/jirs-client/src/components/styled_select_child.rs b/web/src/components/styled_select_child.rs similarity index 100% rename from jirs-client/src/components/styled_select_child.rs rename to web/src/components/styled_select_child.rs diff --git a/jirs-client/src/components/styled_textarea.rs b/web/src/components/styled_textarea.rs similarity index 100% rename from jirs-client/src/components/styled_textarea.rs rename to web/src/components/styled_textarea.rs diff --git a/jirs-client/src/components/styled_tip.rs b/web/src/components/styled_tip.rs similarity index 100% rename from jirs-client/src/components/styled_tip.rs rename to web/src/components/styled_tip.rs diff --git a/jirs-client/src/components/styled_tooltip.rs b/web/src/components/styled_tooltip.rs similarity index 100% rename from jirs-client/src/components/styled_tooltip.rs rename to web/src/components/styled_tooltip.rs diff --git a/jirs-client/src/fields.rs b/web/src/fields.rs similarity index 100% rename from jirs-client/src/fields.rs rename to web/src/fields.rs diff --git a/jirs-client/src/images/mod.rs b/web/src/images/mod.rs similarity index 100% rename from jirs-client/src/images/mod.rs rename to web/src/images/mod.rs diff --git a/jirs-client/src/images/project_avatar.rs b/web/src/images/project_avatar.rs similarity index 100% rename from jirs-client/src/images/project_avatar.rs rename to web/src/images/project_avatar.rs diff --git a/jirs-client/src/lib.rs b/web/src/lib.rs similarity index 100% rename from jirs-client/src/lib.rs rename to web/src/lib.rs diff --git a/web/src/location.rs b/web/src/location.rs new file mode 100644 index 00000000..e9ca6054 --- /dev/null +++ b/web/src/location.rs @@ -0,0 +1,14 @@ +pub fn host_url() -> &'static str { + if cfg!(debug_assertions) { + "http://localhost:5000" + } else { + "https://localhost:5000" + } +} +pub fn ws_url() -> &'static str { + if cfg!(debug_assertions) { + "ws://localhost:5000/ws/" + } else { + "wss://localhost:5000/ws/" + } +} \ No newline at end of file diff --git a/jirs-client/src/modals/comments_delete/mod.rs b/web/src/modals/comments_delete/mod.rs similarity index 100% rename from jirs-client/src/modals/comments_delete/mod.rs rename to web/src/modals/comments_delete/mod.rs diff --git a/jirs-client/src/modals/comments_delete/model.rs b/web/src/modals/comments_delete/model.rs similarity index 100% rename from jirs-client/src/modals/comments_delete/model.rs rename to web/src/modals/comments_delete/model.rs diff --git a/jirs-client/src/modals/comments_delete/view.rs b/web/src/modals/comments_delete/view.rs similarity index 100% rename from jirs-client/src/modals/comments_delete/view.rs rename to web/src/modals/comments_delete/view.rs diff --git a/jirs-client/src/modals/debug/mod.rs b/web/src/modals/debug/mod.rs similarity index 100% rename from jirs-client/src/modals/debug/mod.rs rename to web/src/modals/debug/mod.rs diff --git a/jirs-client/src/modals/debug/model.rs b/web/src/modals/debug/model.rs similarity index 100% rename from jirs-client/src/modals/debug/model.rs rename to web/src/modals/debug/model.rs diff --git a/jirs-client/src/modals/debug/update.rs b/web/src/modals/debug/update.rs similarity index 100% rename from jirs-client/src/modals/debug/update.rs rename to web/src/modals/debug/update.rs diff --git a/jirs-client/src/modals/debug/view.rs b/web/src/modals/debug/view.rs similarity index 100% rename from jirs-client/src/modals/debug/view.rs rename to web/src/modals/debug/view.rs diff --git a/jirs-client/src/modals/epic_field.rs b/web/src/modals/epic_field.rs similarity index 100% rename from jirs-client/src/modals/epic_field.rs rename to web/src/modals/epic_field.rs diff --git a/jirs-client/src/modals/epics_delete/mod.rs b/web/src/modals/epics_delete/mod.rs similarity index 100% rename from jirs-client/src/modals/epics_delete/mod.rs rename to web/src/modals/epics_delete/mod.rs diff --git a/jirs-client/src/modals/epics_delete/model.rs b/web/src/modals/epics_delete/model.rs similarity index 100% rename from jirs-client/src/modals/epics_delete/model.rs rename to web/src/modals/epics_delete/model.rs diff --git a/jirs-client/src/modals/epics_delete/update.rs b/web/src/modals/epics_delete/update.rs similarity index 100% rename from jirs-client/src/modals/epics_delete/update.rs rename to web/src/modals/epics_delete/update.rs diff --git a/jirs-client/src/modals/epics_delete/view.rs b/web/src/modals/epics_delete/view.rs similarity index 100% rename from jirs-client/src/modals/epics_delete/view.rs rename to web/src/modals/epics_delete/view.rs diff --git a/jirs-client/src/modals/epics_edit/mod.rs b/web/src/modals/epics_edit/mod.rs similarity index 100% rename from jirs-client/src/modals/epics_edit/mod.rs rename to web/src/modals/epics_edit/mod.rs diff --git a/jirs-client/src/modals/epics_edit/model.rs b/web/src/modals/epics_edit/model.rs similarity index 100% rename from jirs-client/src/modals/epics_edit/model.rs rename to web/src/modals/epics_edit/model.rs diff --git a/jirs-client/src/modals/epics_edit/update.rs b/web/src/modals/epics_edit/update.rs similarity index 100% rename from jirs-client/src/modals/epics_edit/update.rs rename to web/src/modals/epics_edit/update.rs diff --git a/jirs-client/src/modals/epics_edit/view.rs b/web/src/modals/epics_edit/view.rs similarity index 100% rename from jirs-client/src/modals/epics_edit/view.rs rename to web/src/modals/epics_edit/view.rs diff --git a/jirs-client/src/modals/issue_statuses_delete/mod.rs b/web/src/modals/issue_statuses_delete/mod.rs similarity index 100% rename from jirs-client/src/modals/issue_statuses_delete/mod.rs rename to web/src/modals/issue_statuses_delete/mod.rs diff --git a/jirs-client/src/modals/issue_statuses_delete/model.rs b/web/src/modals/issue_statuses_delete/model.rs similarity index 100% rename from jirs-client/src/modals/issue_statuses_delete/model.rs rename to web/src/modals/issue_statuses_delete/model.rs diff --git a/jirs-client/src/modals/issue_statuses_delete/update.rs b/web/src/modals/issue_statuses_delete/update.rs similarity index 100% rename from jirs-client/src/modals/issue_statuses_delete/update.rs rename to web/src/modals/issue_statuses_delete/update.rs diff --git a/jirs-client/src/modals/issue_statuses_delete/view.rs b/web/src/modals/issue_statuses_delete/view.rs similarity index 100% rename from jirs-client/src/modals/issue_statuses_delete/view.rs rename to web/src/modals/issue_statuses_delete/view.rs diff --git a/jirs-client/src/modals/issues_create/mod.rs b/web/src/modals/issues_create/mod.rs similarity index 100% rename from jirs-client/src/modals/issues_create/mod.rs rename to web/src/modals/issues_create/mod.rs diff --git a/jirs-client/src/modals/issues_create/model.rs b/web/src/modals/issues_create/model.rs similarity index 100% rename from jirs-client/src/modals/issues_create/model.rs rename to web/src/modals/issues_create/model.rs diff --git a/jirs-client/src/modals/issues_create/update.rs b/web/src/modals/issues_create/update.rs similarity index 100% rename from jirs-client/src/modals/issues_create/update.rs rename to web/src/modals/issues_create/update.rs diff --git a/jirs-client/src/modals/issues_create/view.rs b/web/src/modals/issues_create/view.rs similarity index 100% rename from jirs-client/src/modals/issues_create/view.rs rename to web/src/modals/issues_create/view.rs diff --git a/jirs-client/src/modals/issues_delete/mod.rs b/web/src/modals/issues_delete/mod.rs similarity index 100% rename from jirs-client/src/modals/issues_delete/mod.rs rename to web/src/modals/issues_delete/mod.rs diff --git a/jirs-client/src/modals/issues_delete/model.rs b/web/src/modals/issues_delete/model.rs similarity index 100% rename from jirs-client/src/modals/issues_delete/model.rs rename to web/src/modals/issues_delete/model.rs diff --git a/jirs-client/src/modals/issues_delete/update.rs b/web/src/modals/issues_delete/update.rs similarity index 100% rename from jirs-client/src/modals/issues_delete/update.rs rename to web/src/modals/issues_delete/update.rs diff --git a/jirs-client/src/modals/issues_delete/view.rs b/web/src/modals/issues_delete/view.rs similarity index 100% rename from jirs-client/src/modals/issues_delete/view.rs rename to web/src/modals/issues_delete/view.rs diff --git a/jirs-client/src/modals/issues_edit/mod.rs b/web/src/modals/issues_edit/mod.rs similarity index 100% rename from jirs-client/src/modals/issues_edit/mod.rs rename to web/src/modals/issues_edit/mod.rs diff --git a/jirs-client/src/modals/issues_edit/model.rs b/web/src/modals/issues_edit/model.rs similarity index 100% rename from jirs-client/src/modals/issues_edit/model.rs rename to web/src/modals/issues_edit/model.rs diff --git a/jirs-client/src/modals/issues_edit/update.rs b/web/src/modals/issues_edit/update.rs similarity index 100% rename from jirs-client/src/modals/issues_edit/update.rs rename to web/src/modals/issues_edit/update.rs diff --git a/jirs-client/src/modals/issues_edit/view.rs b/web/src/modals/issues_edit/view.rs similarity index 100% rename from jirs-client/src/modals/issues_edit/view.rs rename to web/src/modals/issues_edit/view.rs diff --git a/jirs-client/src/modals/issues_edit/view/comments.rs b/web/src/modals/issues_edit/view/comments.rs similarity index 100% rename from jirs-client/src/modals/issues_edit/view/comments.rs rename to web/src/modals/issues_edit/view/comments.rs diff --git a/jirs-client/src/modals/mod.rs b/web/src/modals/mod.rs similarity index 100% rename from jirs-client/src/modals/mod.rs rename to web/src/modals/mod.rs diff --git a/jirs-client/src/modals/time_tracking/mod.rs b/web/src/modals/time_tracking/mod.rs similarity index 100% rename from jirs-client/src/modals/time_tracking/mod.rs rename to web/src/modals/time_tracking/mod.rs diff --git a/jirs-client/src/modals/time_tracking/model.rs b/web/src/modals/time_tracking/model.rs similarity index 100% rename from jirs-client/src/modals/time_tracking/model.rs rename to web/src/modals/time_tracking/model.rs diff --git a/jirs-client/src/modals/time_tracking/update.rs b/web/src/modals/time_tracking/update.rs similarity index 100% rename from jirs-client/src/modals/time_tracking/update.rs rename to web/src/modals/time_tracking/update.rs diff --git a/jirs-client/src/modals/time_tracking/view.rs b/web/src/modals/time_tracking/view.rs similarity index 100% rename from jirs-client/src/modals/time_tracking/view.rs rename to web/src/modals/time_tracking/view.rs diff --git a/jirs-client/src/modals/update.rs b/web/src/modals/update.rs similarity index 100% rename from jirs-client/src/modals/update.rs rename to web/src/modals/update.rs diff --git a/jirs-client/src/modals/view.rs b/web/src/modals/view.rs similarity index 100% rename from jirs-client/src/modals/view.rs rename to web/src/modals/view.rs diff --git a/jirs-client/src/model.rs b/web/src/model.rs similarity index 100% rename from jirs-client/src/model.rs rename to web/src/model.rs diff --git a/jirs-client/src/pages/epics_page/mod.rs b/web/src/pages/epics_page/mod.rs similarity index 100% rename from jirs-client/src/pages/epics_page/mod.rs rename to web/src/pages/epics_page/mod.rs diff --git a/jirs-client/src/pages/epics_page/model.rs b/web/src/pages/epics_page/model.rs similarity index 100% rename from jirs-client/src/pages/epics_page/model.rs rename to web/src/pages/epics_page/model.rs diff --git a/jirs-client/src/pages/epics_page/update.rs b/web/src/pages/epics_page/update.rs similarity index 100% rename from jirs-client/src/pages/epics_page/update.rs rename to web/src/pages/epics_page/update.rs diff --git a/jirs-client/src/pages/epics_page/view.rs b/web/src/pages/epics_page/view.rs similarity index 100% rename from jirs-client/src/pages/epics_page/view.rs rename to web/src/pages/epics_page/view.rs diff --git a/jirs-client/src/pages/invite_page/mod.rs b/web/src/pages/invite_page/mod.rs similarity index 100% rename from jirs-client/src/pages/invite_page/mod.rs rename to web/src/pages/invite_page/mod.rs diff --git a/jirs-client/src/pages/invite_page/model.rs b/web/src/pages/invite_page/model.rs similarity index 100% rename from jirs-client/src/pages/invite_page/model.rs rename to web/src/pages/invite_page/model.rs diff --git a/jirs-client/src/pages/invite_page/update.rs b/web/src/pages/invite_page/update.rs similarity index 100% rename from jirs-client/src/pages/invite_page/update.rs rename to web/src/pages/invite_page/update.rs diff --git a/jirs-client/src/pages/invite_page/view.rs b/web/src/pages/invite_page/view.rs similarity index 100% rename from jirs-client/src/pages/invite_page/view.rs rename to web/src/pages/invite_page/view.rs diff --git a/jirs-client/src/pages/issues_and_filters/mod.rs b/web/src/pages/issues_and_filters/mod.rs similarity index 100% rename from jirs-client/src/pages/issues_and_filters/mod.rs rename to web/src/pages/issues_and_filters/mod.rs diff --git a/jirs-client/src/pages/issues_and_filters/model.rs b/web/src/pages/issues_and_filters/model.rs similarity index 100% rename from jirs-client/src/pages/issues_and_filters/model.rs rename to web/src/pages/issues_and_filters/model.rs diff --git a/jirs-client/src/pages/issues_and_filters/update.rs b/web/src/pages/issues_and_filters/update.rs similarity index 100% rename from jirs-client/src/pages/issues_and_filters/update.rs rename to web/src/pages/issues_and_filters/update.rs diff --git a/jirs-client/src/pages/issues_and_filters/view.rs b/web/src/pages/issues_and_filters/view.rs similarity index 100% rename from jirs-client/src/pages/issues_and_filters/view.rs rename to web/src/pages/issues_and_filters/view.rs diff --git a/jirs-client/src/pages/issues_and_filters/view/filters.rs b/web/src/pages/issues_and_filters/view/filters.rs similarity index 100% rename from jirs-client/src/pages/issues_and_filters/view/filters.rs rename to web/src/pages/issues_and_filters/view/filters.rs diff --git a/jirs-client/src/pages/issues_and_filters/view/issue_info.rs b/web/src/pages/issues_and_filters/view/issue_info.rs similarity index 100% rename from jirs-client/src/pages/issues_and_filters/view/issue_info.rs rename to web/src/pages/issues_and_filters/view/issue_info.rs diff --git a/jirs-client/src/pages/mod.rs b/web/src/pages/mod.rs similarity index 100% rename from jirs-client/src/pages/mod.rs rename to web/src/pages/mod.rs diff --git a/jirs-client/src/pages/profile_page/mod.rs b/web/src/pages/profile_page/mod.rs similarity index 100% rename from jirs-client/src/pages/profile_page/mod.rs rename to web/src/pages/profile_page/mod.rs diff --git a/jirs-client/src/pages/profile_page/model.rs b/web/src/pages/profile_page/model.rs similarity index 100% rename from jirs-client/src/pages/profile_page/model.rs rename to web/src/pages/profile_page/model.rs diff --git a/jirs-client/src/pages/profile_page/update.rs b/web/src/pages/profile_page/update.rs similarity index 100% rename from jirs-client/src/pages/profile_page/update.rs rename to web/src/pages/profile_page/update.rs diff --git a/jirs-client/src/pages/profile_page/view.rs b/web/src/pages/profile_page/view.rs similarity index 100% rename from jirs-client/src/pages/profile_page/view.rs rename to web/src/pages/profile_page/view.rs diff --git a/jirs-client/src/pages/project_page/mod.rs b/web/src/pages/project_page/mod.rs similarity index 100% rename from jirs-client/src/pages/project_page/mod.rs rename to web/src/pages/project_page/mod.rs diff --git a/jirs-client/src/pages/project_page/model.rs b/web/src/pages/project_page/model.rs similarity index 100% rename from jirs-client/src/pages/project_page/model.rs rename to web/src/pages/project_page/model.rs diff --git a/jirs-client/src/pages/project_page/update.rs b/web/src/pages/project_page/update.rs similarity index 100% rename from jirs-client/src/pages/project_page/update.rs rename to web/src/pages/project_page/update.rs diff --git a/jirs-client/src/pages/project_page/view.rs b/web/src/pages/project_page/view.rs similarity index 100% rename from jirs-client/src/pages/project_page/view.rs rename to web/src/pages/project_page/view.rs diff --git a/jirs-client/src/pages/project_page/view/board.rs b/web/src/pages/project_page/view/board.rs similarity index 100% rename from jirs-client/src/pages/project_page/view/board.rs rename to web/src/pages/project_page/view/board.rs diff --git a/jirs-client/src/pages/project_page/view/filters.rs b/web/src/pages/project_page/view/filters.rs similarity index 100% rename from jirs-client/src/pages/project_page/view/filters.rs rename to web/src/pages/project_page/view/filters.rs diff --git a/jirs-client/src/pages/project_settings_page/mod.rs b/web/src/pages/project_settings_page/mod.rs similarity index 100% rename from jirs-client/src/pages/project_settings_page/mod.rs rename to web/src/pages/project_settings_page/mod.rs diff --git a/jirs-client/src/pages/project_settings_page/model.rs b/web/src/pages/project_settings_page/model.rs similarity index 100% rename from jirs-client/src/pages/project_settings_page/model.rs rename to web/src/pages/project_settings_page/model.rs diff --git a/jirs-client/src/pages/project_settings_page/time_tracking_fibonacci.txt b/web/src/pages/project_settings_page/time_tracking_fibonacci.txt similarity index 100% rename from jirs-client/src/pages/project_settings_page/time_tracking_fibonacci.txt rename to web/src/pages/project_settings_page/time_tracking_fibonacci.txt diff --git a/jirs-client/src/pages/project_settings_page/time_tracking_hourly.txt b/web/src/pages/project_settings_page/time_tracking_hourly.txt similarity index 100% rename from jirs-client/src/pages/project_settings_page/time_tracking_hourly.txt rename to web/src/pages/project_settings_page/time_tracking_hourly.txt diff --git a/jirs-client/src/pages/project_settings_page/update.rs b/web/src/pages/project_settings_page/update.rs similarity index 100% rename from jirs-client/src/pages/project_settings_page/update.rs rename to web/src/pages/project_settings_page/update.rs diff --git a/jirs-client/src/pages/project_settings_page/view.rs b/web/src/pages/project_settings_page/view.rs similarity index 100% rename from jirs-client/src/pages/project_settings_page/view.rs rename to web/src/pages/project_settings_page/view.rs diff --git a/jirs-client/src/pages/reports_page/mod.rs b/web/src/pages/reports_page/mod.rs similarity index 100% rename from jirs-client/src/pages/reports_page/mod.rs rename to web/src/pages/reports_page/mod.rs diff --git a/jirs-client/src/pages/reports_page/model.rs b/web/src/pages/reports_page/model.rs similarity index 100% rename from jirs-client/src/pages/reports_page/model.rs rename to web/src/pages/reports_page/model.rs diff --git a/jirs-client/src/pages/reports_page/update.rs b/web/src/pages/reports_page/update.rs similarity index 100% rename from jirs-client/src/pages/reports_page/update.rs rename to web/src/pages/reports_page/update.rs diff --git a/jirs-client/src/pages/reports_page/view.rs b/web/src/pages/reports_page/view.rs similarity index 100% rename from jirs-client/src/pages/reports_page/view.rs rename to web/src/pages/reports_page/view.rs diff --git a/jirs-client/src/pages/sign_in_page/mod.rs b/web/src/pages/sign_in_page/mod.rs similarity index 100% rename from jirs-client/src/pages/sign_in_page/mod.rs rename to web/src/pages/sign_in_page/mod.rs diff --git a/jirs-client/src/pages/sign_in_page/model.rs b/web/src/pages/sign_in_page/model.rs similarity index 100% rename from jirs-client/src/pages/sign_in_page/model.rs rename to web/src/pages/sign_in_page/model.rs diff --git a/jirs-client/src/pages/sign_in_page/update.rs b/web/src/pages/sign_in_page/update.rs similarity index 100% rename from jirs-client/src/pages/sign_in_page/update.rs rename to web/src/pages/sign_in_page/update.rs diff --git a/jirs-client/src/pages/sign_in_page/view.rs b/web/src/pages/sign_in_page/view.rs similarity index 100% rename from jirs-client/src/pages/sign_in_page/view.rs rename to web/src/pages/sign_in_page/view.rs diff --git a/jirs-client/src/pages/sign_up_page/mod.rs b/web/src/pages/sign_up_page/mod.rs similarity index 100% rename from jirs-client/src/pages/sign_up_page/mod.rs rename to web/src/pages/sign_up_page/mod.rs diff --git a/jirs-client/src/pages/sign_up_page/model.rs b/web/src/pages/sign_up_page/model.rs similarity index 100% rename from jirs-client/src/pages/sign_up_page/model.rs rename to web/src/pages/sign_up_page/model.rs diff --git a/jirs-client/src/pages/sign_up_page/update.rs b/web/src/pages/sign_up_page/update.rs similarity index 100% rename from jirs-client/src/pages/sign_up_page/update.rs rename to web/src/pages/sign_up_page/update.rs diff --git a/jirs-client/src/pages/sign_up_page/view.rs b/web/src/pages/sign_up_page/view.rs similarity index 100% rename from jirs-client/src/pages/sign_up_page/view.rs rename to web/src/pages/sign_up_page/view.rs diff --git a/jirs-client/src/pages/users_page/mod.rs b/web/src/pages/users_page/mod.rs similarity index 100% rename from jirs-client/src/pages/users_page/mod.rs rename to web/src/pages/users_page/mod.rs diff --git a/jirs-client/src/pages/users_page/model.rs b/web/src/pages/users_page/model.rs similarity index 100% rename from jirs-client/src/pages/users_page/model.rs rename to web/src/pages/users_page/model.rs diff --git a/jirs-client/src/pages/users_page/update.rs b/web/src/pages/users_page/update.rs similarity index 100% rename from jirs-client/src/pages/users_page/update.rs rename to web/src/pages/users_page/update.rs diff --git a/jirs-client/src/pages/users_page/view.rs b/web/src/pages/users_page/view.rs similarity index 100% rename from jirs-client/src/pages/users_page/view.rs rename to web/src/pages/users_page/view.rs diff --git a/jirs-client/src/shared/aside.rs b/web/src/shared/aside.rs similarity index 100% rename from jirs-client/src/shared/aside.rs rename to web/src/shared/aside.rs diff --git a/jirs-client/src/shared/drag.rs b/web/src/shared/drag.rs similarity index 100% rename from jirs-client/src/shared/drag.rs rename to web/src/shared/drag.rs diff --git a/jirs-client/src/shared/mod.rs b/web/src/shared/mod.rs similarity index 100% rename from jirs-client/src/shared/mod.rs rename to web/src/shared/mod.rs diff --git a/jirs-client/src/shared/navbar_left.rs b/web/src/shared/navbar_left.rs similarity index 100% rename from jirs-client/src/shared/navbar_left.rs rename to web/src/shared/navbar_left.rs diff --git a/jirs-client/src/shared/on_event.rs b/web/src/shared/on_event.rs similarity index 100% rename from jirs-client/src/shared/on_event.rs rename to web/src/shared/on_event.rs diff --git a/jirs-client/src/shared/tracking_widget.rs b/web/src/shared/tracking_widget.rs similarity index 100% rename from jirs-client/src/shared/tracking_widget.rs rename to web/src/shared/tracking_widget.rs diff --git a/jirs-client/src/shared/validate.rs b/web/src/shared/validate.rs similarity index 100% rename from jirs-client/src/shared/validate.rs rename to web/src/shared/validate.rs diff --git a/jirs-client/src/validations.rs b/web/src/validations.rs similarity index 100% rename from jirs-client/src/validations.rs rename to web/src/validations.rs diff --git a/jirs-client/src/ws/init_load_sets.rs b/web/src/ws/init_load_sets.rs similarity index 100% rename from jirs-client/src/ws/init_load_sets.rs rename to web/src/ws/init_load_sets.rs diff --git a/jirs-client/src/ws/issue.rs b/web/src/ws/issue.rs similarity index 100% rename from jirs-client/src/ws/issue.rs rename to web/src/ws/issue.rs diff --git a/jirs-client/src/ws/mod.rs b/web/src/ws/mod.rs similarity index 100% rename from jirs-client/src/ws/mod.rs rename to web/src/ws/mod.rs diff --git a/jirs-client/static/favicon.png b/web/static/favicon.png similarity index 100% rename from jirs-client/static/favicon.png rename to web/static/favicon.png diff --git a/jirs-client/static/feedback.png b/web/static/feedback.png similarity index 100% rename from jirs-client/static/feedback.png rename to web/static/feedback.png diff --git a/jirs-client/static/fonts/CircularStd-Black.eot b/web/static/fonts/CircularStd-Black.eot similarity index 100% rename from jirs-client/static/fonts/CircularStd-Black.eot rename to web/static/fonts/CircularStd-Black.eot diff --git a/jirs-client/static/fonts/CircularStd-Black.otf b/web/static/fonts/CircularStd-Black.otf similarity index 100% rename from jirs-client/static/fonts/CircularStd-Black.otf rename to web/static/fonts/CircularStd-Black.otf diff --git a/jirs-client/static/fonts/CircularStd-Black.svg b/web/static/fonts/CircularStd-Black.svg similarity index 100% rename from jirs-client/static/fonts/CircularStd-Black.svg rename to web/static/fonts/CircularStd-Black.svg diff --git a/jirs-client/static/fonts/CircularStd-Black.ttf b/web/static/fonts/CircularStd-Black.ttf similarity index 100% rename from jirs-client/static/fonts/CircularStd-Black.ttf rename to web/static/fonts/CircularStd-Black.ttf diff --git a/jirs-client/static/fonts/CircularStd-Black.woff b/web/static/fonts/CircularStd-Black.woff similarity index 100% rename from jirs-client/static/fonts/CircularStd-Black.woff rename to web/static/fonts/CircularStd-Black.woff diff --git a/jirs-client/static/fonts/CircularStd-Black.woff2 b/web/static/fonts/CircularStd-Black.woff2 similarity index 100% rename from jirs-client/static/fonts/CircularStd-Black.woff2 rename to web/static/fonts/CircularStd-Black.woff2 diff --git a/jirs-client/static/fonts/CircularStd-Bold.eot b/web/static/fonts/CircularStd-Bold.eot similarity index 100% rename from jirs-client/static/fonts/CircularStd-Bold.eot rename to web/static/fonts/CircularStd-Bold.eot diff --git a/jirs-client/static/fonts/CircularStd-Bold.otf b/web/static/fonts/CircularStd-Bold.otf similarity index 100% rename from jirs-client/static/fonts/CircularStd-Bold.otf rename to web/static/fonts/CircularStd-Bold.otf diff --git a/jirs-client/static/fonts/CircularStd-Bold.svg b/web/static/fonts/CircularStd-Bold.svg similarity index 100% rename from jirs-client/static/fonts/CircularStd-Bold.svg rename to web/static/fonts/CircularStd-Bold.svg diff --git a/jirs-client/static/fonts/CircularStd-Bold.ttf b/web/static/fonts/CircularStd-Bold.ttf similarity index 100% rename from jirs-client/static/fonts/CircularStd-Bold.ttf rename to web/static/fonts/CircularStd-Bold.ttf diff --git a/jirs-client/static/fonts/CircularStd-Bold.woff b/web/static/fonts/CircularStd-Bold.woff similarity index 100% rename from jirs-client/static/fonts/CircularStd-Bold.woff rename to web/static/fonts/CircularStd-Bold.woff diff --git a/jirs-client/static/fonts/CircularStd-Bold.woff2 b/web/static/fonts/CircularStd-Bold.woff2 similarity index 100% rename from jirs-client/static/fonts/CircularStd-Bold.woff2 rename to web/static/fonts/CircularStd-Bold.woff2 diff --git a/jirs-client/static/fonts/CircularStd-Book.eot b/web/static/fonts/CircularStd-Book.eot similarity index 100% rename from jirs-client/static/fonts/CircularStd-Book.eot rename to web/static/fonts/CircularStd-Book.eot diff --git a/jirs-client/static/fonts/CircularStd-Book.otf b/web/static/fonts/CircularStd-Book.otf similarity index 100% rename from jirs-client/static/fonts/CircularStd-Book.otf rename to web/static/fonts/CircularStd-Book.otf diff --git a/jirs-client/static/fonts/CircularStd-Book.svg b/web/static/fonts/CircularStd-Book.svg similarity index 100% rename from jirs-client/static/fonts/CircularStd-Book.svg rename to web/static/fonts/CircularStd-Book.svg diff --git a/jirs-client/static/fonts/CircularStd-Book.ttf b/web/static/fonts/CircularStd-Book.ttf similarity index 100% rename from jirs-client/static/fonts/CircularStd-Book.ttf rename to web/static/fonts/CircularStd-Book.ttf diff --git a/jirs-client/static/fonts/CircularStd-Book.woff b/web/static/fonts/CircularStd-Book.woff similarity index 100% rename from jirs-client/static/fonts/CircularStd-Book.woff rename to web/static/fonts/CircularStd-Book.woff diff --git a/jirs-client/static/fonts/CircularStd-Book.woff2 b/web/static/fonts/CircularStd-Book.woff2 similarity index 100% rename from jirs-client/static/fonts/CircularStd-Book.woff2 rename to web/static/fonts/CircularStd-Book.woff2 diff --git a/jirs-client/static/fonts/CircularStd-Medium.eot b/web/static/fonts/CircularStd-Medium.eot similarity index 100% rename from jirs-client/static/fonts/CircularStd-Medium.eot rename to web/static/fonts/CircularStd-Medium.eot diff --git a/jirs-client/static/fonts/CircularStd-Medium.otf b/web/static/fonts/CircularStd-Medium.otf similarity index 100% rename from jirs-client/static/fonts/CircularStd-Medium.otf rename to web/static/fonts/CircularStd-Medium.otf diff --git a/jirs-client/static/fonts/CircularStd-Medium.svg b/web/static/fonts/CircularStd-Medium.svg similarity index 100% rename from jirs-client/static/fonts/CircularStd-Medium.svg rename to web/static/fonts/CircularStd-Medium.svg diff --git a/jirs-client/static/fonts/CircularStd-Medium.ttf b/web/static/fonts/CircularStd-Medium.ttf similarity index 100% rename from jirs-client/static/fonts/CircularStd-Medium.ttf rename to web/static/fonts/CircularStd-Medium.ttf diff --git a/jirs-client/static/fonts/CircularStd-Medium.woff b/web/static/fonts/CircularStd-Medium.woff similarity index 100% rename from jirs-client/static/fonts/CircularStd-Medium.woff rename to web/static/fonts/CircularStd-Medium.woff diff --git a/jirs-client/static/fonts/CircularStd-Medium.woff2 b/web/static/fonts/CircularStd-Medium.woff2 similarity index 100% rename from jirs-client/static/fonts/CircularStd-Medium.woff2 rename to web/static/fonts/CircularStd-Medium.woff2 diff --git a/jirs-client/static/fonts/icofont.eot b/web/static/fonts/icofont.eot similarity index 100% rename from jirs-client/static/fonts/icofont.eot rename to web/static/fonts/icofont.eot diff --git a/jirs-client/static/fonts/icofont.svg b/web/static/fonts/icofont.svg similarity index 100% rename from jirs-client/static/fonts/icofont.svg rename to web/static/fonts/icofont.svg diff --git a/jirs-client/static/fonts/icofont.ttf b/web/static/fonts/icofont.ttf similarity index 100% rename from jirs-client/static/fonts/icofont.ttf rename to web/static/fonts/icofont.ttf diff --git a/jirs-client/static/fonts/icofont.woff b/web/static/fonts/icofont.woff similarity index 100% rename from jirs-client/static/fonts/icofont.woff rename to web/static/fonts/icofont.woff diff --git a/jirs-client/static/fonts/icofont.woff2 b/web/static/fonts/icofont.woff2 similarity index 100% rename from jirs-client/static/fonts/icofont.woff2 rename to web/static/fonts/icofont.woff2 diff --git a/jirs-client/static/fonts/jira.svg b/web/static/fonts/jira.svg similarity index 100% rename from jirs-client/static/fonts/jira.svg rename to web/static/fonts/jira.svg diff --git a/jirs-client/static/fonts/jira.ttf b/web/static/fonts/jira.ttf similarity index 100% rename from jirs-client/static/fonts/jira.ttf rename to web/static/fonts/jira.ttf diff --git a/jirs-client/static/fonts/jira.woff b/web/static/fonts/jira.woff similarity index 100% rename from jirs-client/static/fonts/jira.woff rename to web/static/fonts/jira.woff diff --git a/jirs-client/static/index.js b/web/static/index.js similarity index 100% rename from jirs-client/static/index.js rename to web/static/index.js diff --git a/jirs-client/static/logo.svg b/web/static/logo.svg similarity index 100% rename from jirs-client/static/logo.svg rename to web/static/logo.svg diff --git a/jirs-client/static/logo2.svg b/web/static/logo2.svg similarity index 100% rename from jirs-client/static/logo2.svg rename to web/static/logo2.svg diff --git a/jirs-client/static/project-avatar.svg b/web/static/project-avatar.svg similarity index 100% rename from jirs-client/static/project-avatar.svg rename to web/static/project-avatar.svg diff --git a/jirs-client/static/project-icon.svg b/web/static/project-icon.svg similarity index 100% rename from jirs-client/static/project-icon.svg rename to web/static/project-icon.svg diff --git a/jirs-client/tests/wasm.rs b/web/tests/wasm.rs similarity index 100% rename from jirs-client/tests/wasm.rs rename to web/tests/wasm.rs