diff --git a/.air.toml b/.air.toml index 1d5affd..c546c22 100644 --- a/.air.toml +++ b/.air.toml @@ -1,4 +1,4 @@ [build] bin = "tmp/cafe-plaetschwiesle" cmd = "go build -o tmp/cafe-plaetschwiesle cmd/cafe-plaetschwiesle/cafe-plaetschwiesle.go" -exclude_dir = [".gitlab", "docker", "scripts", "frontend", "storage", "tmp", "docs"] +exclude_dir = [".gitlab", "docker", "scripts", "web", "storage", "tmp", "docs"] diff --git a/docker-compose.yml b/docker-compose.yml index 9194f13..e796d39 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -102,7 +102,7 @@ services: networks: - net volumes: - - ./frontend:/app/ + - ./web:/app/ cafe-backend: build: diff --git a/docker/Dockerfile b/docker/Dockerfile index 84f89ab..130bcfb 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -19,12 +19,12 @@ RUN go build -ldflags="-s -w" cmd/cafe-plaetschwiesle/cafe-plaetschwiesle.go FROM node:${NODE_VERSION}-alpine AS nodeBuilder WORKDIR /app -COPY ./frontend/package.json . -COPY ./frontend/yarn.lock . +COPY ./web/package.json . +COPY ./web/yarn.lock . RUN yarn install --frozen-lockfile COPY --from=goBuilder /app/docs/swagger.json ../docs/swagger.json -COPY ./frontend/ . +COPY ./web/ . RUN yarn run types:openapi RUN yarn run build diff --git a/frontend/.dockerignore b/web/.dockerignore similarity index 100% rename from frontend/.dockerignore rename to web/.dockerignore diff --git a/frontend/.gitignore b/web/.gitignore similarity index 100% rename from frontend/.gitignore rename to web/.gitignore diff --git a/frontend/README.md b/web/README.md similarity index 96% rename from frontend/README.md rename to web/README.md index fb1f6eb..8fe4eab 100644 --- a/frontend/README.md +++ b/web/README.md @@ -1,29 +1,35 @@ -# frontend +# web ## Project setup + ``` npm install ``` ### Compiles and hot-reloads for development + ``` npm run serve ``` ### Compiles and minifies for production + ``` npm run build ``` ### Run your unit tests + ``` npm run test:unit ``` ### Lints and fixes files + ``` npm run lint ``` ### Customize configuration + See [Configuration Reference](https://cli.vuejs.org/config/). diff --git a/frontend/babel.config.js b/web/babel.config.js similarity index 100% rename from frontend/babel.config.js rename to web/babel.config.js diff --git a/frontend/package.json b/web/package.json similarity index 99% rename from frontend/package.json rename to web/package.json index 7be8523..35106ea 100644 --- a/frontend/package.json +++ b/web/package.json @@ -1,5 +1,5 @@ { - "name": "frontend", + "name": "web", "version": "0.1.0", "private": true, "scripts": { diff --git a/frontend/public/favicon/android-chrome-192x192.png b/web/public/favicon/android-chrome-192x192.png similarity index 100% rename from frontend/public/favicon/android-chrome-192x192.png rename to web/public/favicon/android-chrome-192x192.png diff --git a/frontend/public/favicon/android-chrome-512x512.png b/web/public/favicon/android-chrome-512x512.png similarity index 100% rename from frontend/public/favicon/android-chrome-512x512.png rename to web/public/favicon/android-chrome-512x512.png diff --git a/frontend/public/favicon/apple-touch-icon.png b/web/public/favicon/apple-touch-icon.png similarity index 100% rename from frontend/public/favicon/apple-touch-icon.png rename to web/public/favicon/apple-touch-icon.png diff --git a/frontend/public/favicon/browserconfig.xml b/web/public/favicon/browserconfig.xml similarity index 100% rename from frontend/public/favicon/browserconfig.xml rename to web/public/favicon/browserconfig.xml diff --git a/frontend/public/favicon/favicon-16x16.png b/web/public/favicon/favicon-16x16.png similarity index 100% rename from frontend/public/favicon/favicon-16x16.png rename to web/public/favicon/favicon-16x16.png diff --git a/frontend/public/favicon/favicon-32x32.png b/web/public/favicon/favicon-32x32.png similarity index 100% rename from frontend/public/favicon/favicon-32x32.png rename to web/public/favicon/favicon-32x32.png diff --git a/frontend/public/favicon/favicon.ico b/web/public/favicon/favicon.ico similarity index 100% rename from frontend/public/favicon/favicon.ico rename to web/public/favicon/favicon.ico diff --git a/frontend/public/favicon/mstile-150x150.png b/web/public/favicon/mstile-150x150.png similarity index 100% rename from frontend/public/favicon/mstile-150x150.png rename to web/public/favicon/mstile-150x150.png diff --git a/frontend/public/favicon/safari-pinned-tab.svg b/web/public/favicon/safari-pinned-tab.svg similarity index 100% rename from frontend/public/favicon/safari-pinned-tab.svg rename to web/public/favicon/safari-pinned-tab.svg diff --git a/frontend/public/favicon/site.webmanifest b/web/public/favicon/site.webmanifest similarity index 100% rename from frontend/public/favicon/site.webmanifest rename to web/public/favicon/site.webmanifest diff --git a/frontend/public/index.html b/web/public/index.html similarity index 100% rename from frontend/public/index.html rename to web/public/index.html diff --git a/frontend/src/App.vue b/web/src/App.vue similarity index 100% rename from frontend/src/App.vue rename to web/src/App.vue diff --git a/frontend/src/assets/fonts/roboto.ttf b/web/src/assets/fonts/roboto.ttf similarity index 100% rename from frontend/src/assets/fonts/roboto.ttf rename to web/src/assets/fonts/roboto.ttf diff --git a/frontend/src/assets/logos/logo.png b/web/src/assets/logos/logo.png similarity index 100% rename from frontend/src/assets/logos/logo.png rename to web/src/assets/logos/logo.png diff --git a/frontend/src/assets/logos/logo_white.png b/web/src/assets/logos/logo_white.png similarity index 100% rename from frontend/src/assets/logos/logo_white.png rename to web/src/assets/logos/logo_white.png diff --git a/frontend/src/components/Bills/BillModal.vue b/web/src/components/Bills/BillModal.vue similarity index 100% rename from frontend/src/components/Bills/BillModal.vue rename to web/src/components/Bills/BillModal.vue diff --git a/frontend/src/components/OrderItem/OrderItemList.vue b/web/src/components/OrderItem/OrderItemList.vue similarity index 100% rename from frontend/src/components/OrderItem/OrderItemList.vue rename to web/src/components/OrderItem/OrderItemList.vue diff --git a/frontend/src/components/Orders/OrderCard.vue b/web/src/components/Orders/OrderCard.vue similarity index 100% rename from frontend/src/components/Orders/OrderCard.vue rename to web/src/components/Orders/OrderCard.vue diff --git a/frontend/src/components/Orders/OrderSection.vue b/web/src/components/Orders/OrderSection.vue similarity index 100% rename from frontend/src/components/Orders/OrderSection.vue rename to web/src/components/Orders/OrderSection.vue diff --git a/frontend/src/components/Tables/OrderAmountChange.vue b/web/src/components/Tables/OrderAmountChange.vue similarity index 100% rename from frontend/src/components/Tables/OrderAmountChange.vue rename to web/src/components/Tables/OrderAmountChange.vue diff --git a/frontend/src/components/Tables/OverviewPerType.vue b/web/src/components/Tables/OverviewPerType.vue similarity index 100% rename from frontend/src/components/Tables/OverviewPerType.vue rename to web/src/components/Tables/OverviewPerType.vue diff --git a/frontend/src/components/Tables/TableCard.vue b/web/src/components/Tables/TableCard.vue similarity index 100% rename from frontend/src/components/Tables/TableCard.vue rename to web/src/components/Tables/TableCard.vue diff --git a/frontend/src/components/Tables/TableOrderCard.vue b/web/src/components/Tables/TableOrderCard.vue similarity index 100% rename from frontend/src/components/Tables/TableOrderCard.vue rename to web/src/components/Tables/TableOrderCard.vue diff --git a/frontend/src/components/Tables/TableOverview.vue b/web/src/components/Tables/TableOverview.vue similarity index 100% rename from frontend/src/components/Tables/TableOverview.vue rename to web/src/components/Tables/TableOverview.vue diff --git a/frontend/src/components/UI/BaseCard.vue b/web/src/components/UI/BaseCard.vue similarity index 100% rename from frontend/src/components/UI/BaseCard.vue rename to web/src/components/UI/BaseCard.vue diff --git a/frontend/src/components/UI/BaseItem.vue b/web/src/components/UI/BaseItem.vue similarity index 100% rename from frontend/src/components/UI/BaseItem.vue rename to web/src/components/UI/BaseItem.vue diff --git a/frontend/src/components/UI/BaseToolbar.vue b/web/src/components/UI/BaseToolbar.vue similarity index 100% rename from frontend/src/components/UI/BaseToolbar.vue rename to web/src/components/UI/BaseToolbar.vue diff --git a/frontend/src/components/UI/BottomNavigation.vue b/web/src/components/UI/BottomNavigation.vue similarity index 100% rename from frontend/src/components/UI/BottomNavigation.vue rename to web/src/components/UI/BottomNavigation.vue diff --git a/frontend/src/components/UI/SmallCard.vue b/web/src/components/UI/SmallCard.vue similarity index 100% rename from frontend/src/components/UI/SmallCard.vue rename to web/src/components/UI/SmallCard.vue diff --git a/frontend/src/components/UI/TheBadge.vue b/web/src/components/UI/TheBadge.vue similarity index 100% rename from frontend/src/components/UI/TheBadge.vue rename to web/src/components/UI/TheBadge.vue diff --git a/frontend/src/components/UI/TheNavigation.vue b/web/src/components/UI/TheNavigation.vue similarity index 100% rename from frontend/src/components/UI/TheNavigation.vue rename to web/src/components/UI/TheNavigation.vue diff --git a/frontend/src/components/UI/WaveSpinner.vue b/web/src/components/UI/WaveSpinner.vue similarity index 100% rename from frontend/src/components/UI/WaveSpinner.vue rename to web/src/components/UI/WaveSpinner.vue diff --git a/frontend/src/components/User/UserSettings.vue b/web/src/components/User/UserSettings.vue similarity index 100% rename from frontend/src/components/User/UserSettings.vue rename to web/src/components/User/UserSettings.vue diff --git a/frontend/src/keys.ts b/web/src/keys.ts similarity index 100% rename from frontend/src/keys.ts rename to web/src/keys.ts diff --git a/frontend/src/main.ts b/web/src/main.ts similarity index 100% rename from frontend/src/main.ts rename to web/src/main.ts diff --git a/frontend/src/router/index.ts b/web/src/router/index.ts similarity index 100% rename from frontend/src/router/index.ts rename to web/src/router/index.ts diff --git a/frontend/src/shims-vue.d.ts b/web/src/shims-vue.d.ts similarity index 100% rename from frontend/src/shims-vue.d.ts rename to web/src/shims-vue.d.ts diff --git a/frontend/src/store/index.ts b/web/src/store/index.ts similarity index 100% rename from frontend/src/store/index.ts rename to web/src/store/index.ts diff --git a/frontend/src/store/orderItems/index.ts b/web/src/store/orderItems/index.ts similarity index 100% rename from frontend/src/store/orderItems/index.ts rename to web/src/store/orderItems/index.ts diff --git a/frontend/src/store/tables/index.ts b/web/src/store/tables/index.ts similarity index 100% rename from frontend/src/store/tables/index.ts rename to web/src/store/tables/index.ts diff --git a/frontend/src/utils.ts b/web/src/utils.ts similarity index 100% rename from frontend/src/utils.ts rename to web/src/utils.ts diff --git a/frontend/src/views/Bills.vue b/web/src/views/Bills.vue similarity index 100% rename from frontend/src/views/Bills.vue rename to web/src/views/Bills.vue diff --git a/frontend/src/views/Checkout.vue b/web/src/views/Checkout.vue similarity index 100% rename from frontend/src/views/Checkout.vue rename to web/src/views/Checkout.vue diff --git a/frontend/src/views/Empty.vue b/web/src/views/Empty.vue similarity index 100% rename from frontend/src/views/Empty.vue rename to web/src/views/Empty.vue diff --git a/frontend/src/views/Items.vue b/web/src/views/Items.vue similarity index 100% rename from frontend/src/views/Items.vue rename to web/src/views/Items.vue diff --git a/frontend/src/views/Orders.vue b/web/src/views/Orders.vue similarity index 100% rename from frontend/src/views/Orders.vue rename to web/src/views/Orders.vue diff --git a/frontend/src/views/Tables.vue b/web/src/views/Tables.vue similarity index 100% rename from frontend/src/views/Tables.vue rename to web/src/views/Tables.vue diff --git a/frontend/tests/unit/example.spec.ts b/web/tests/unit/example.spec.ts similarity index 100% rename from frontend/tests/unit/example.spec.ts rename to web/tests/unit/example.spec.ts diff --git a/frontend/tsconfig.json b/web/tsconfig.json similarity index 100% rename from frontend/tsconfig.json rename to web/tsconfig.json diff --git a/frontend/vue.config.js b/web/vue.config.js similarity index 100% rename from frontend/vue.config.js rename to web/vue.config.js diff --git a/frontend/yarn.lock b/web/yarn.lock similarity index 100% rename from frontend/yarn.lock rename to web/yarn.lock