Skip to content

Commit

Permalink
Merge pull request #250 from esune/fix/vite-production-build
Browse files Browse the repository at this point in the history
Fix UI issues in main search view
  • Loading branch information
WadeBarnes authored Dec 18, 2024
2 parents 023b3ae + d8effc8 commit 840912e
Show file tree
Hide file tree
Showing 8 changed files with 3,512 additions and 4,845 deletions.
12 changes: 0 additions & 12 deletions .devcontainer/Dockerfile

This file was deleted.

13 changes: 7 additions & 6 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"name": "Vue (Community)",
"build": {
"dockerfile": "Dockerfile",
"context": ".."
},
"image": "mcr.microsoft.com/vscode/devcontainers/javascript-node:1-22",

// Configure tool-specific properties.
"customizations": {
Expand All @@ -19,12 +16,16 @@

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [
8080
8081
],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "uname -a",

// Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "node"
"remoteUser": "node",

"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
}
}
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
89 changes: 89 additions & 0 deletions components.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/* eslint-disable */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}

/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
About: typeof import('./src/components/layout/footer/About.vue')['default']
BackTo: typeof import('./src/components/shared/BackTo.vue')['default']
ContactForm: typeof import('./src/components/contact/ContactForm.vue')['default']
CredentialDetail: typeof import('./src/components/entity/credentialDetail/CredentialDetail.vue')['default']
CredentialItem: typeof import('./src/components/entity/CredentialItem.vue')['default']
CustomFilterFacetPanel: typeof import('./src/components/entity/filter/CustomFilterFacetPanel.vue')['default']
Dialog: typeof import('./src/components/shared/Dialog.vue')['default']
EntityCard: typeof import('./src/components/entity/EntityCard.vue')['default']
EntityFilterChips: typeof import('./src/components/entity/filter/EntityFilterChips.vue')['default']
EntityFilterDialog: typeof import('./src/components/entity/filter/EntityFilterDialog.vue')['default']
EntityFilterFacetPanel: typeof import('./src/components/entity/filter/EntityFilterFacetPanel.vue')['default']
EntityFilterFacetPanels: typeof import('./src/components/entity/filter/EntityFilterFacetPanels.vue')['default']
EntityFilterFacets: typeof import('./src/components/entity/filter/EntityFilterFacets.vue')['default']
EntityHeader: typeof import('./src/components/entity/EntityHeader.vue')['default']
EntityResult: typeof import('./src/components/entity/EntityResult.vue')['default']
Feedback: typeof import('./src/components/layout/footer/Feedback.vue')['default']
Footer: typeof import('./src/components/layout/footer/Footer.vue')['default']
Header: typeof import('./src/components/layout/header/Header.vue')['default']
Loading: typeof import('./src/components/shared/Loading.vue')['default']
OrgBookData: typeof import('./src/components/about/OrgBookData.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
SearchBar: typeof import('./src/components/search/SearchBar.vue')['default']
SearchDescription: typeof import('./src/components/search/SearchDescription.vue')['default']
SearchFilterChips: typeof import('./src/components/search/filter/SearchFilterChips.vue')['default']
SearchFilterDialog: typeof import('./src/components/search/filter/SearchFilterDialog.vue')['default']
SearchFilterFacetPanel: typeof import('./src/components/search/filter/SearchFilterFacetPanel.vue')['default']
SearchFilterFacetPanels: typeof import('./src/components/search/filter/SearchFilterFacetPanels.vue')['default']
SearchFilterFacets: typeof import('./src/components/search/filter/SearchFilterFacets.vue')['default']
SearchFilterResultCount: typeof import('./src/components/search/filter/SearchFilterResultCount.vue')['default']
SearchHelp: typeof import('./src/components/search/SearchHelp.vue')['default']
SearchHelpPopup: typeof import('./src/components/search/SearchHelpPopup.vue')['default']
SearchHome: typeof import('./src/components/search/SearchHome.vue')['default']
SearchLoading: typeof import('./src/components/search/SearchLoading.vue')['default']
SearchResult: typeof import('./src/components/search/SearchResult.vue')['default']
SearchTopic: typeof import('./src/components/search/page/SearchTopic.vue')['default']
SearchTopicPage: typeof import('./src/components/search/page/SearchTopicPage.vue')['default']
SearchTopicPageNavigation: typeof import('./src/components/search/page/SearchTopicPageNavigation.vue')['default']
ShowcaseLinks: typeof import('./src/components/about/ShowcaseLinks.vue')['default']
SubHeader: typeof import('./src/components/layout/header/SubHeader.vue')['default']
VAlert: typeof import('vuetify/lib')['VAlert']
VApp: typeof import('vuetify/lib')['VApp']
VAppBar: typeof import('vuetify/lib')['VAppBar']
VAppBarNavIcon: typeof import('vuetify/lib')['VAppBarNavIcon']
VBtn: typeof import('vuetify/lib')['VBtn']
VCard: typeof import('vuetify/lib')['VCard']
VCardActions: typeof import('vuetify/lib')['VCardActions']
VCardText: typeof import('vuetify/lib')['VCardText']
VCardTitle: typeof import('vuetify/lib')['VCardTitle']
VChip: typeof import('vuetify/lib')['VChip']
VCol: typeof import('vuetify/lib')['VCol']
VContainer: typeof import('vuetify/lib')['VContainer']
VDialog: typeof import('vuetify/lib')['VDialog']
VExpansionPanel: typeof import('vuetify/lib')['VExpansionPanel']
VExpansionPanelContent: typeof import('vuetify/lib')['VExpansionPanelContent']
VExpansionPanelHeader: typeof import('vuetify/lib')['VExpansionPanelHeader']
VExpansionPanels: typeof import('vuetify/lib')['VExpansionPanels']
VFooter: typeof import('vuetify/lib')['VFooter']
VIcon: typeof import('vuetify/lib')['VIcon']
VList: typeof import('vuetify/lib')['VList']
VListItem: typeof import('vuetify/lib')['VListItem']
VListItemAction: typeof import('vuetify/lib')['VListItemAction']
VListItemContent: typeof import('vuetify/lib')['VListItemContent']
VListItemGroup: typeof import('vuetify/lib')['VListItemGroup']
VMain: typeof import('vuetify/lib')['VMain']
VNavigationDrawer: typeof import('vuetify/lib')['VNavigationDrawer']
VProgressCircular: typeof import('vuetify/lib')['VProgressCircular']
VProgressLinear: typeof import('vuetify/lib')['VProgressLinear']
VRow: typeof import('vuetify/lib')['VRow']
VScrollXTransition: typeof import('vuetify/lib')['VScrollXTransition']
VSimpleCheckbox: typeof import('vuetify/lib')['VSimpleCheckbox']
VSimpleTable: typeof import('vuetify/lib')['VSimpleTable']
VSkeletonLoader: typeof import('vuetify/lib')['VSkeletonLoader']
VSpacer: typeof import('vuetify/lib')['VSpacer']
VTextField: typeof import('vuetify/lib')['VTextField']
VToolbar: typeof import('vuetify/lib')['VToolbar']
VToolbarItems: typeof import('vuetify/lib')['VToolbarItems']
VToolbarTitle: typeof import('vuetify/lib')['VToolbarTitle']
}
}
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ ARG caddy_builder_image=caddy:builder-alpine
ARG runtime_image=caddy:alpine

# build stage
FROM ${build_image} as build-stage
FROM ${build_image} AS build-stage
WORKDIR /app
COPY package*.json ./
RUN npm install
COPY . .
RUN npm run build

# caddy build stage
FROM ${caddy_builder_image} as caddy-build-stage
FROM ${caddy_builder_image} AS caddy-build-stage

# Install ratelimit/v0.3.0
RUN xcaddy build \
--with github.com/RussellLuo/caddy-ext/ratelimit@ab1e18cfe426012af351a68463937ae2e934a2a1

# production stage
FROM ${runtime_image} as production-stage
FROM ${runtime_image} AS production-stage

COPY --from=caddy-build-stage /usr/bin/caddy /usr/bin/caddy
COPY --from=build-stage /app/dist /srv
Expand Down
Loading

0 comments on commit 840912e

Please sign in to comment.