Skip to content

VITE INBOX: POC to test the ease of migrating other views to vite #8916

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.

Sign up for GitHub

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

Open
henryjonathanquispe wants to merge 1 commit into
base: VITE_JONAS
Choose a base branch
from
Open

VITE INBOX: POC to test the ease of migrating other views to vite #8916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion ProcessMaker/Http/Controllers/TaskController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,13 @@ public function index()
$metricsApiEndpoint = EnvironmentVariable::getMetricsApiEndpoint();
}

return view('tasks.index', compact(
$viteView = json_decode(config('app.vite_view') ?: '{}', true);
$tasksView = 'tasks.index';
if (!empty($viteView['tasks.index'])) {
$tasksView = $viteView['tasks.index'];
}

return view($tasksView, compact(
// User and Authentication related
'currentUser',
'userFilter',
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"devDependencies": {
"@babel/eslint-parser": "^7.15.8",
"@babel/preset-env": "^7.23.9",
"@rollup/plugin-yaml": "^5.0.0",
"@vitejs/plugin-vue2": "^2.3.4",
"accounting": "^0.4.1",
"autoprefixer": "^10.4.20",
Expand Down
6 changes: 4 additions & 2 deletions resources/js/Mobile/WelcomeModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<p class="text-center">
<img
class="image"
src="/img/welcome_mobile.svg"
:src="welcomeMobileImage"
alt="recent projects"
>
</p>
Expand All @@ -45,7 +45,9 @@
export default {
props: ["username"],
data() {
return {};
return {
welcomeMobileImage: '/img/welcome_mobile.svg',
};
},
methods: {
hideModal() {
Expand Down
24 changes: 12 additions & 12 deletions resources/js/components/PMColumnFilterPopover/PMColumnFilterOp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import PMColumnFilterIconMinus from "./PMColumnFilterIconMinus";
import PMColumnFilterIconPlus from "./PMColumnFilterIconPlus";
import PMColumnFilterOpBetween from "./PMColumnFilterOpBetween";
import PMColumnFilterOpIn from "./PMColumnFilterOpIn";
import PMColumnFilterOpBetweenDatepicker from "./PMColumnFilterOpBetweenDatepicker";
import PMColumnFilterOpInDatepicker from "./PMColumnFilterOpInDatepicker";
import PMColumnFilterOpDatetime from "./PMColumnFilterOpDatetime";
import PMColumnFilterOpInput from "./PMColumnFilterOpInput";
import PMColumnFilterOpSelect from "./PMColumnFilterOpSelect";
import PMColumnFilterOpSelectMultiple from "./PMColumnFilterOpSelectMultiple";
import PMColumnFilterOpBoolean from "./PMColumnFilterOpBoolean";
import PMColumnFilterToggleAscDesc from "./PMColumnFilterToggleAscDesc";
import PMColumnFilterIconMinus from "./PMColumnFilterIconMinus.vue";
import PMColumnFilterIconPlus from "./PMColumnFilterIconPlus.vue";
import PMColumnFilterOpBetween from "./PMColumnFilterOpBetween.vue";
import PMColumnFilterOpIn from "./PMColumnFilterOpIn.vue";
import PMColumnFilterOpBetweenDatepicker from "./PMColumnFilterOpBetweenDatepicker.vue";
import PMColumnFilterOpInDatepicker from "./PMColumnFilterOpInDatepicker.vue";
import PMColumnFilterOpDatetime from "./PMColumnFilterOpDatetime.vue";
import PMColumnFilterOpInput from "./PMColumnFilterOpInput.vue";
import PMColumnFilterOpSelect from "./PMColumnFilterOpSelect.vue";
import PMColumnFilterOpSelectMultiple from "./PMColumnFilterOpSelectMultiple.vue";
import PMColumnFilterOpBoolean from "./PMColumnFilterOpBoolean.vue";
import PMColumnFilterToggleAscDesc from "./PMColumnFilterToggleAscDesc.vue";

export {
PMColumnFilterIconMinus,
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/PMColumnFilterPopover/PMColumnFilterOpBetweenDatepicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</template>

<script>
import PMColumnFilterOpDatetime from "./PMColumnFilterOpDatetime"
import PMColumnFilterOpDatetime from "./PMColumnFilterOpDatetime.vue"

export default {
components: {
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/PMColumnFilterPopover/PMColumnFilterOpInDatepicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</template>

<script>
import PMColumnFilterOpDatetime from "./PMColumnFilterOpDatetime"
import PMColumnFilterOpDatetime from "./PMColumnFilterOpDatetime.vue"
export default {
components: {
PMColumnFilterOpDatetime
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
</template>

<script>
import PMColumnFilterForm from "./PMColumnFilterForm"
import PMColumnFilterIconThreeDots from "./PMColumnFilterIconThreeDots"
import PMColumnFilterForm from "./PMColumnFilterForm.vue"
import PMColumnFilterIconThreeDots from "./PMColumnFilterIconThreeDots.vue"

export default {
components: {
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/PMColumnFilterPopover/PMColumnFilterToggleAscDesc.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</template>

<script>
import PMColumnFilterIconAsc from "./PMColumnFilterIconAsc";
import PMColumnFilterIconDesc from "./PMColumnFilterIconDesc";
import PMColumnFilterIconAsc from "./PMColumnFilterIconAsc.vue";
import PMColumnFilterIconDesc from "./PMColumnFilterIconDesc.vue";

export default {
components: {
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/TimelineItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<i v-else :class="icon"></i>
</div>
<avatar-image v-if="value.user" class="mr-1" size="24" :input-data="value.user" hide-name="true"></avatar-image>
<img v-else class="default-user mr-1" src="/img/systemAvatar.png">
<img v-else class="default-user mr-1">
<div class="flex-grow-1">
<strong :title="value.updated_at">{{moment(value.updated_at).format()}}</strong>
<slot v-if="hasBodySlot" name="body"></slot>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/common/mixins/apiDataLoading.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import DataLoading from "../../../components/common/DataLoading";
import DataLoading from "../../../components/common/DataLoading.vue";

export default {
components: {
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/common/mixins/datatable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* pagination transformers, etc.
*
*/
import Vuetable from "vuetable-2/src/components/Vuetable";
import Pagination from "../../../components/common/Pagination";
import Vuetable from "vuetable-2/src/components/Vuetable.vue";
import Pagination from "../../../components/common/Pagination.vue";
import FilterTableBodyMixin from "../../shared/FilterTableBodyMixin";
export default {
mixins:[FilterTableBodyMixin],
Expand Down
3 changes: 2 additions & 1 deletion resources/js/components/requests/requestModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
>
<img
class="m-3"
src="/img/new-case-load.svg"
:src="newCaseLoadImage"
alt="new-case-loading"
width="209"
height="155"
Expand Down Expand Up @@ -152,6 +152,7 @@ export default {
},
data() {
return {
newCaseLoadImage: '/img/new-case-load.svg',
filter: "",
loading: false,
error: false,
Expand Down
6 changes: 3 additions & 3 deletions resources/js/components/shared/AddToProjectModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
<script>

import FormErrorsMixin from "./FormErrorsMixin";
import Modal from "./Modal";
import Required from "./Required";
import ProjectSelect from "./ProjectSelect";
import Modal from "./Modal.vue";
import Required from "./Required.vue";
import ProjectSelect from "./ProjectSelect.vue";

export default {
components: { Modal, ProjectSelect, Required },
Expand Down
6 changes: 3 additions & 3 deletions resources/js/components/shared/ColumnChooser.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@
</template>

<script>
import Column from "./Column";
import ColumnConfig from "./ColumnConfig";
import DataLoadingBasic from "./DataLoadingBasic";
import Column from "./Column.vue";
import ColumnConfig from "./ColumnConfig.vue";
import DataLoadingBasic from "./DataLoadingBasic.vue";
import draggable from "vuedraggable";
import defaultTaskColumns from "../../tasks/components/defaultTaskColumns";

Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/shared/ColumnConfig.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
</template>

<script>
import DataFormatSelector from './DataFormatSelector';
import DataMaskSelector from './DataMaskSelector';
import DataFormatSelector from './DataFormatSelector.vue';
import DataMaskSelector from './DataMaskSelector.vue';

export default {
components: {
Expand Down
3 changes: 2 additions & 1 deletion resources/js/components/shared/DownloadSvgButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<div class="d-flex justify-content-center align-items-center" style="min-height: 45em;padding: 3em 0 3em 0;">
<img :src="modelImg" :alt="title">
</div>
<div><h5><img src="/img/icon-pmlogo.png" alt="ProcessMaker logo" style="height: 30px;" class="mr-1"><b>Powered By ProcessMaker AI</b></h5></div>
<div><h5><img :src="iconLogo" alt="ProcessMaker logo" style="height: 30px;" class="mr-1"><b>Powered By ProcessMaker AI</b></h5></div>
<div class="d-flex justify-items-between">
<div class="w-50 text-muted"><small>Process Model Autogenerated by ProcessMaker AI {{ requestDate }}</small></div>
<div class="w-50 text-muted text-right"><small>Generate your own process map at <span class="text-primary">https://processmaker.com/ai</span></small></div>
Expand Down Expand Up @@ -101,6 +101,7 @@ export default {
isLoading: false,
modelImg: null,
img: null,
iconLogo: '/img/icon-pmlogo.png',
};
},
watch: {
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/shared/IconSelector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

<script>
import Icons from './Icons';
import FileUploadButton from './FileUploadButton';
import FileUploadButton from './FileUploadButton.vue';
export default {
components: {
FileUploadButton,
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/shared/Icons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import icons from "js-yaml-loader!@fortawesome/fontawesome-free/metadata/icons.yml";
import icons from "@fortawesome/fontawesome-free/metadata/icons.yml";

const common = [
"search",
Expand Down
7 changes: 6 additions & 1 deletion resources/js/components/shared/Modal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<required class="required-footer"></required>
</div>
<div v-if="showAiSlogan" class="slogan">
<img src="/img/favicon.ico"> {{ $t("Powered by Decisions AI") }}
<img :src="favicon"> {{ $t("Powered by Decisions AI") }}
</div>
</div>
<div>
Expand Down Expand Up @@ -136,6 +136,11 @@
"footerClass",
"contentClass"
],
data() {
return {
favicon: '/img/favicon.ico',
}
},
methods: {
onEvent(name, event) {
this.$emit(name, event);
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/shared/PTabs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</template>

<script>
import PTab from "./PTab";
import SidebarNav from "./SidebarNav";
import PTab from "./PTab.vue";
import SidebarNav from "./SidebarNav.vue";

export default {
components: { PTab, SidebarNav },
Expand Down
12 changes: 8 additions & 4 deletions resources/js/components/shared/PaginationTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
variant="light"
@click="firstPage"
>
<img src="/img/pagination-images/first.svg" :alt="$t('No Image')">
<img :src="firstPageImage" :alt="$t('No Image')">
</b-button>
<b-button
:disabled="currentPage === 1"
class="pagination-button"
variant="light"
@click="previousPage"
>
<img src="/img/pagination-images/previous.svg" :alt="$t('No Image')">
<img :src="previousPageImage" :alt="$t('No Image')">
</b-button>

<input
Expand All @@ -36,15 +36,15 @@
variant="light"
@click="nextPage"
>
<img src="/img/pagination-images/next.svg" :alt="$t('No Image')">
<img :src="nextPageImage" :alt="$t('No Image')">
</b-button>
<b-button
:disabled="currentPage >= totalPageCount"
class="pagination-button"
variant="light"
@click="lastPage"
>
<img src="/img/pagination-images/last.svg" :alt="$t('No Image')">
<img :src="lastPageImage" :alt="$t('No Image')">
</b-button>
<span class="pagination-total">
{{ totalItems }}
Expand Down Expand Up @@ -100,6 +100,10 @@ export default {
},
data() {
return {
firstPageImage: '/img/pagination-images/first.svg',
previousPageImage: '/img/pagination-images/previous.svg',
nextPageImage: '/img/pagination-images/next.svg',
lastPageImage: '/img/pagination-images/last.svg',
itemsPerPage: [
{
perPage: this.$t("15 items"),
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/shared/SidebarNav.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</template>

<script>
import SidebarButton from "./SidebarButton";
import SidebarButton from "./SidebarButton.vue";

export default {
components: { SidebarButton },
Expand Down
58 changes: 29 additions & 29 deletions resources/js/components/shared/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
import AddToProjectModal from "./AddToProjectModal";
import BasicSearch from "./BasicSearch";
import CategorySelect from "./CategorySelect";
import ChangeLog from "./ChangeLog";
import ColorSchemeSelector from "./ColorSchemeSelector";
import Column from "./Column";
import ColumnChooser from "./ColumnChooser";
import ColumnConfig from "./ColumnConfig";
import DataFormatSelector from "./DataFormatSelector";
import DataLoadingBasic from "./DataLoadingBasic";
import DataMaskSelector from "./DataMaskSelector";
import DraggableFileUpload from "./DraggableFileUpload";
import EllipsisMenu from "./EllipsisMenu";
import AddToProjectModal from "./AddToProjectModal.vue";
import BasicSearch from "./BasicSearch.vue";
import CategorySelect from "./CategorySelect.vue";
import ChangeLog from "./ChangeLog.vue";
import ColorSchemeSelector from "./ColorSchemeSelector.vue";
import Column from "./Column.vue";
import ColumnChooser from "./ColumnChooser.vue";
import ColumnConfig from "./ColumnConfig.vue";
import DataFormatSelector from "./DataFormatSelector.vue";
import DataLoadingBasic from "./DataLoadingBasic.vue";
import DataMaskSelector from "./DataMaskSelector.vue";
import DraggableFileUpload from "./DraggableFileUpload.vue";
import EllipsisMenu from "./EllipsisMenu.vue";
import EnterPasswordModal from "../../processes/import/components/EnterPasswordModal.vue";
import FileUploadButton from "./FileUploadButton";
import FileUploadButton from "./FileUploadButton.vue";
import FormErrorsMixin from "./FormErrorsMixin";
import AssetRedirectMixin from "./AssetRedirectMixin";
import IconSelector from "./IconSelector";
import IconDropdown from "./IconDropdown";
import IconSelector from "./IconSelector.vue";
import IconDropdown from "./IconDropdown.vue";
import InputImageCarousel from "./InputImageCarousel.vue";
import Modal from "./Modal";
import Modal from "./Modal.vue";
import ModalSaveVersion from "./ModalSaveVersion.vue";
import PmqlInput from "./PmqlInput";
import PTab from "./PTab";
import PTabs from "./PTabs";
import ProjectSelect from "./ProjectSelect";
import Required from "./Required";
import PmqlInput from "./PmqlInput.vue";
import PTab from "./PTab.vue";
import PTabs from "./PTabs.vue";
import ProjectSelect from "./ProjectSelect.vue";
import Required from "./Required.vue";
import SelectTemplateModal from "../templates/SelectTemplateModal.vue";
import SelectUserGroup from "./SelectUserGroup";
import SidebarButton from "./SidebarButton";
import SidebarNav from "./SidebarNav";
import SliderWithInput from "./SliderWithInput";
import SelectUserGroup from "./SelectUserGroup.vue";
import SidebarButton from "./SidebarButton.vue";
import SidebarNav from "./SidebarNav.vue";
import SliderWithInput from "./SliderWithInput.vue";
import DownloadSvgButton from "./DownloadSvgButton.vue";
import CustomExportView from "../../processes/export/components/CustomExportView.vue";
import ExportStateMixin from "../../processes/export/state";
Expand All @@ -51,11 +51,11 @@ import FilterableTable from "../../../jscomposition/system/table/FilterableTable
import EmptyPlaceholder from "../../../jscomposition/system/placeholders/EmptyPlaceholder.vue";
import LoadingPlaceholder from "../../../jscomposition/system/placeholders/LoadingPlaceholder.vue";
import Pagination from "../../../jscomposition/system/table/Pagination.vue";
import TasksList from '../../tasks/components/TasksList';
import TasksList from '../../tasks/components/TasksList.vue';
import apiDataLoading from '../common/mixins/apiDataLoading';
import datatableMixin from '../common/mixins/datatable';
import DataLoading from '../../components/common/DataLoading';
import AvatarImage from '../../components/AvatarImage';
import DataLoading from '../../components/common/DataLoading.vue';
import AvatarImage from '../../components/AvatarImage.vue';
import FilterTableBodyMixin from "./FilterTableBodyMixin";
import PaginationTable from "./PaginationTable.vue";
import { ellipsisSortClick } from "./UtilsTable";
Expand Down
3 changes: 2 additions & 1 deletion resources/js/components/templates/TemplateExistsModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
</template>

<script>
import { FormErrorsMixin, Modal } from "SharedComponents";
import FormErrorsMixin from "../shared/FormErrorsMixin.js";
import Modal from "../shared/Modal.vue";

export default {
components: { Modal },
Expand Down
Loading
Loading