Skip to content

Commit

Permalink
GitHub pages (#71)
Browse files Browse the repository at this point in the history
* Deployable and buildable

* Type reference fixes

* Create build-check.yml
  • Loading branch information
fabianlinkflink authored Nov 21, 2024
1 parent 49755f5 commit fcfbe8c
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 14 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/build-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Buildable check
on:
pull_request:
branches:
- main

jobs:
build:
runs-on: ubuntu-latest

steps:
# Checkout the repository
- name: Checkout repository
uses: actions/checkout@v3

# Set up Node.js
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 20.11

# Install dependencies
- name: Install dependencies
run: npm i

# Build the project
- name: Build project
run: npm run build
3 changes: 1 addition & 2 deletions src/components/DetailBar/ResultsBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ import {
} from 'chart.js'
import { Bar } from 'vue-chartjs'
import ChartDataLabels from 'chartjs-plugin-datalabels'
import type { Results } from '@/models/project'
import type { Emission } from '@/models/material'
import { GeometryObject } from '@/models/geometryObject'
import type { GeometryObject } from '@/models/geometryObject'
ChartJS.register(
Title,
Expand Down
4 changes: 3 additions & 1 deletion src/components/Graphs/GraphContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ import {
materialResultsToMaterialChartData,
geometryToMaterialTypeNestedChartData
} from '@/utils/resultUtils'
import { ChartData, ChartOptions, NestedChartData } from '@/models/chartModels'
// Type imports
import type { ChartData, ChartOptions, NestedChartData } from '@/models/chartModels'
const navigationStore = useNavigationStore()
const resultStore = useResultStore()
Expand Down
3 changes: 2 additions & 1 deletion src/components/Mapping/MaterialBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
</template>

<script lang="ts">
import { defineComponent, computed, ref, watch, Ref } from 'vue'
import { defineComponent, computed, ref, watch } from 'vue'
import type { Ref } from 'vue'
import { PaintBrushIcon, MinusCircleIcon } from '@heroicons/vue/20/solid'
import { Sketch } from '@ckpack/vue-color'
import type { ColorInput } from '@ctrl/tinycolor'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { useSettingsStore } from '@/stores/settings'
import { useProjectStore } from '@/stores/main'
import { useFirebaseStore } from '@/stores/firebase'
import { CalculationSettings } from '@/models/settings'
import type { CalculationSettings } from '@/models/settings'
import type { CalculationSettingsLog } from '@/models/firebase'
import type { dropdownItem } from '@/components/Misc/Dropdown.vue'
Expand Down
3 changes: 2 additions & 1 deletion src/components/Misc/Settings/SettingsImpactCategory.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
<script lang="ts">
import { defineComponent, ref, watch } from 'vue'
import { useSettingsStore } from '@/stores/settings'
import { extendedImpactCategoryKeys } from '@/models/material'
import { ExtendedImpactCategoryKey, extendedImpactCategoryKeys } from '@/models/material'
import type { ExtendedImpactCategoryKey } from '@/models/material'
import type { dropdownItem } from '@/components/Misc/Dropdown.vue'
import Dropdown from '@/components/Misc/Dropdown.vue'
Expand Down
6 changes: 4 additions & 2 deletions src/components/Misc/Settings/SettingsSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@
</template>

<script lang="ts">
import { defineComponent, PropType, ref, Ref } from 'vue'
import { SettingView } from '@/models/settings';
import { defineComponent} from 'vue'
import type { PropType } from 'vue'
import type { SettingView } from '@/models/settings';
export default defineComponent({
name: 'SettingsSidebar',
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modals/SettingsModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ import SettingsSpeckle from '@/components/Misc/Settings/SettingsSpeckle.vue'
import SettingsMaterials from '@/components/Misc/Settings/SettingsMaterials.vue'
import SettingsGithub from '@/components/Misc/Settings/SettingsGithub.vue'
import { SettingView } from '@/models/settings'
import type { SettingView } from '@/models/settings'
export default defineComponent({
name: 'SettingsModal',
Expand Down
5 changes: 3 additions & 2 deletions src/components/SlideOver/SaveMapping.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,14 @@

<script lang="ts">
import { defineComponent, ref } from 'vue'
import { XMarkIcon } from '@heroicons/vue/24/outline'
import { XMarkIcon } from '@heroicons/vue/24/outline'
import { useProjectStore } from '@/stores/main'
import { useNavigationStore } from '@/stores/navigation'
import { useMaterialStore } from '@/stores/material'
import { useFirebaseStore } from '@/stores/firebase'
import { Mapping } from '@/models/material'
import type { Mapping } from '@/models/material'
export default defineComponent({
name: 'SaveMapping',
Expand Down
2 changes: 1 addition & 1 deletion src/stores/firebase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
deepToRaw,
removeUndefinedFields
} from '@/utils/dataUtils'
import { CalculationSettings } from '@/models/settings'
import type { CalculationSettings } from '@/models/settings'

export const useFirebaseStore = defineStore('firebase', {
state: () => ({
Expand Down
3 changes: 1 addition & 2 deletions src/utils/material.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import type { Mapping, MaterialFilterParam, Product } from "@/models/material"
import type { FilterList, NestedGroup } from "@/models/filters"
import type { GeometryObject } from "@/models/geometryObject"
import type { AssemblyList } from "@/models/firebase"

import { useProjectStore } from "@/stores/main"
import { useMaterialStore } from "@/stores/material"
import { useSpeckleStore } from "@/stores/speckle"
import { useFirebaseStore } from "@/stores/firebase"

import { setMappingColorGroup, updateProjectGroups } from "@/utils/projectUtils"
import { AssemblyList } from "@/models/firebase"


/**
* Updates from a selected mapping to a new one, with all materials and objectIds
Expand Down

0 comments on commit fcfbe8c

Please sign in to comment.