Skip to content

Commit 0fc9321

Browse files
authored
Sync with templates (#5)
1 parent 548eb2e commit 0fc9321

File tree

11 files changed

+190
-49
lines changed

11 files changed

+190
-49
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Makefile for local development
22

3+
sync:
4+
npm init @novomanu/project-cli
5+
36
rebuild_backend:
47
docker-compose down -v
58
docker-compose run backend npm run rebuild

backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN mkdir -p /home/node/app
1010
WORKDIR /home/node/app
1111

1212
# Install app dependencies
13-
# A wildcard is used to ensure both [[m]]package.json AND package-lock.json are copied
13+
# A wildcard is used to ensure both package.json AND package-lock.json are copied
1414
# where available (npm@5+)
1515
COPY --chown=node package*.json ./
1616

backend/public/img/login.svg

Lines changed: 3 additions & 0 deletions
Loading

frontend/eslintrc.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require("@rushstack/eslint-patch/modern-module-resolution");
44
module.exports = {
55
root: true,
66
extends: [
7-
"plugin:vue/test-composable-recommended",
7+
"plugin:vue/vue3-recommended",
88
"eslint:recommended",
99
"@vue/eslint-config-prettier",
1010
],

frontend/package-lock.json

Lines changed: 133 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,18 @@
55
"dev": "vite",
66
"build": "vite build",
77
"preview": "vite preview --port 5050",
8-
"test:unit": "vitest --environment jsdom",
9-
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore"
8+
"test:unit": "vitest",
9+
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore",
10+
"test": "vitest"
1011
},
1112
"dependencies": {
13+
"axios": "^1.1.3",
1214
"pinia": "^2.0.14",
1315
"vue": "^3.2.35",
1416
"vue-router": "^4.0.15"
1517
},
1618
"devDependencies": {
19+
"@pinia/testing": "^0.0.14",
1720
"@rushstack/eslint-patch": "^1.1.3",
1821
"@vitejs/plugin-vue": "^2.3.3",
1922
"@vue/eslint-config-prettier": "^7.0.0",

frontend/src/assets/scss/scaffolding.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
@use "ds-system/ds.scss";
2+
13
body {
24
display: flex;
35
flex-direction: column;
46

57
min-width: 960px;
68
min-height: 100vh;
79

8-
color: $black;
9-
background-color: $white;
10+
color: ds.$black;
11+
background-color: ds.$white;
1012

1113
font-family: "Roboto", Arial, sans-serif;
1214
font-size: 14px;

0 commit comments

Comments
 (0)