Skip to content

Commit

Permalink
Sync with templates (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
xyz27900 authored Dec 11, 2022
1 parent 548eb2e commit 0fc9321
Show file tree
Hide file tree
Showing 11 changed files with 190 additions and 49 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Makefile for local development

sync:
npm init @novomanu/project-cli

rebuild_backend:
docker-compose down -v
docker-compose run backend npm run rebuild
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN mkdir -p /home/node/app
WORKDIR /home/node/app

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

Expand Down
3 changes: 3 additions & 0 deletions backend/public/img/login.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion frontend/eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ require("@rushstack/eslint-patch/modern-module-resolution");
module.exports = {
root: true,
extends: [
"plugin:vue/test-composable-recommended",
"plugin:vue/vue3-recommended",
"eslint:recommended",
"@vue/eslint-config-prettier",
],
Expand Down
163 changes: 133 additions & 30 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,18 @@
"dev": "vite",
"build": "vite build",
"preview": "vite preview --port 5050",
"test:unit": "vitest --environment jsdom",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore"
"test:unit": "vitest",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore",
"test": "vitest"
},
"dependencies": {
"axios": "^1.1.3",
"pinia": "^2.0.14",
"vue": "^3.2.35",
"vue-router": "^4.0.15"
},
"devDependencies": {
"@pinia/testing": "^0.0.14",
"@rushstack/eslint-patch": "^1.1.3",
"@vitejs/plugin-vue": "^2.3.3",
"@vue/eslint-config-prettier": "^7.0.0",
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/assets/scss/scaffolding.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
@use "ds-system/ds.scss";

body {
display: flex;
flex-direction: column;

min-width: 960px;
min-height: 100vh;

color: $black;
background-color: $white;
color: ds.$black;
background-color: ds.$white;

font-family: "Roboto", Arial, sans-serif;
font-size: 14px;
Expand Down
Loading

0 comments on commit 0fc9321

Please sign in to comment.