Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
c9b254c
initial commit
zmigrOO Mar 10, 2024
6d960c2
dockerfile fixes
zmigrOO Mar 10, 2024
dc3d83f
hopefully last commit
zmigrOO Mar 10, 2024
e7c4364
updated makefile
zmigrOO Mar 12, 2024
5fc7b01
fixes to makefile
zmigrOO Mar 13, 2024
cf28c11
deleted comments
zmigrOO Mar 13, 2024
061bad9
nav
zmigrOO Mar 22, 2024
985e030
added flags, updated makefile, project runs under blumilk env
zmigrOO Mar 22, 2024
0a975be
fixed docker-compose and makefile
zmigrOO Mar 22, 2024
43d2a4c
localization
zmigrOO Mar 25, 2024
8d1aca7
localization works
zmigrOO Mar 25, 2024
caed5bb
prune added to makefile
zmigrOO Mar 25, 2024
9bff1d0
migrated to vite from vue-cli
zmigrOO Apr 2, 2024
dca90d0
makefile changes
zmigrOO Apr 2, 2024
e6adb62
migrating from laravel in progress
zmigrOO Apr 3, 2024
b6109ba
make lint
zmigrOO Apr 4, 2024
ea1d95a
fixes
zmigrOO Apr 4, 2024
f0fd937
fixes to components
zmigrOO Apr 4, 2024
36f579c
readme
zmigrOO Apr 4, 2024
2551187
makefile updated
zmigrOO Apr 4, 2024
9289b2f
updated dockerfile
zmigrOO Apr 5, 2024
3c8165f
.
zmigrOO Apr 5, 2024
ecc8a1a
lint
zmigrOO Apr 8, 2024
6bcaa24
Update .prettierrc.json
zmigrOO Apr 8, 2024
117f043
port changes
zmigrOO Apr 8, 2024
7e726ce
Merge branch 'docker' of https://github.com/blumilksoftware/e-motion-…
zmigrOO Apr 8, 2024
c0479a2
home rwd
zmigrOO Apr 12, 2024
187c803
minor changes
zmigrOO Apr 12, 2024
f4f0585
localization
zmigrOO Apr 15, 2024
850046f
requested changes
zmigrOO Apr 15, 2024
65c37dc
Update vite.config.ts
zmigrOO Apr 15, 2024
2a1a258
router
zmigrOO Apr 15, 2024
01c6ad7
localization
zmigrOO Apr 15, 2024
03d22ad
Merge branch 'layout-and-views' of https://github.com/blumilksoftware…
zmigrOO Apr 15, 2024
3cbb3aa
map displaying
zmigrOO Apr 15, 2024
e14b9c2
Landing Page
zmigrOO Apr 15, 2024
5b1caa8
Landing page
zmigrOO Apr 16, 2024
f97056b
dynamic scroller works
zmigrOO Apr 16, 2024
b5c9437
Landing almost working
zmigrOO Apr 16, 2024
8ba828d
City view
zmigrOO Apr 18, 2024
e82882b
layout migration
zmigrOO May 1, 2024
4cbde25
Landing view changes
zmigrOO May 2, 2024
9059ac0
dashboard done
zmigrOO May 6, 2024
a22d98a
change city coords on map
zmigrOO May 6, 2024
f89319c
map viewing fixed
zmigrOO May 6, 2024
1c401ba
updating city name and coords works
zmigrOO May 6, 2024
87261a3
map buttons refactor
zmigrOO May 7, 2024
114a709
Country component
zmigrOO May 7, 2024
f59f75b
layout work in progress
zmigrOO May 12, 2024
e882dfe
work in progress
zmigrOO May 12, 2024
9922415
work in progress
zmigrOO May 12, 2024
8b831ef
work in progress
zmigrOO May 13, 2024
c631899
Country map
zmigrOO May 13, 2024
dc18209
en translations
zmigrOO May 14, 2024
b9bf233
fixes
zmigrOO May 14, 2024
54075d9
typefixes
zmigrOO May 14, 2024
b7c8513
more typefixes
zmigrOO May 14, 2024
80360ae
tests
zmigrOO May 14, 2024
69dabf3
trying to fix page not reloading
zmigrOO May 14, 2024
e77b111
changed createWebHistory to createWebHashHistory in router
zmigrOO May 14, 2024
dd750c0
linting
zmigrOO May 14, 2024
a3dedc3
linting
zmigrOO May 14, 2024
6e41b2b
router fix
zmigrOO May 14, 2024
1060ae3
parse
zmigrOO May 14, 2024
120d5c0
json
zmigrOO May 14, 2024
a4a8632
api
zmigrOO May 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DOCKER_APP_HOST_PORT=3854
57 changes: 57 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
.DS_Store
node_modules
/dist

/tests/e2e/videos/
/tests/e2e/screenshots/


# local env files
.env.local
.env.*.local
.env

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
.DS_Store
dist
dist-ssr
coverage
*.local

/cypress/videos/
/cypress/screenshots/

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

*.tsbuildinfo
22 changes: 22 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"$schema": "https://json.schemastore.org/prettierrc",
"semi": false,
"tabWidth": 2,
"singleQuote": true,
"printWidth": 100,
"trailingComma": "none",
"importOrder": [
"<THIRD_PARTY_MODULES>",
"interface",
"(?=content|api)",
"context/",
"mock/",
"config",
"utils/",
"hooks/",
"(components/|./index)",
".svg",
"^../(.*)$",
"(?=./styles.module.scss)"
]
}
28 changes: 28 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
init:
[ -f .env ] || cp .env.example .env
make run

run:
docker compose up -d
docker logs -f e-motion-web

shell:
docker exec -it e-motion-web sh

img-clean:
docker rmi e-motion-web

stop:
docker compose down

prune:
make stop
docker system prune -a

lint:
docker exec -it e-motion-web npm run lint

test:
docker exec -it e-motion-web npm run test:e2e

.PHONY: init run shell img-clean stop prune lint test
3 changes: 3 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
presets: ["@vue/cli-plugin-babel/preset"],
};
2 changes: 2 additions & 0 deletions cypress.config.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
declare const _default: Cypress.ConfigOptions<any>;
export default _default;
9 changes: 9 additions & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { defineConfig } from 'cypress'

export default defineConfig({
e2e: {
specPattern: '/e-motion-web/tests/e2e/specs/*.{cy,spec}.{js,jsx,ts,tsx}',
baseUrl: 'http://172.18.0.2:4173',
supportFile: false,
},
})
10 changes: 10 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
services:
node:
image: node:21.5-bullseye-slim
container_name: e-motion-web
working_dir: /e-motion-web
volumes:
- .:/e-motion-web
restart: unless-stopped
tty: true
command: bash -c "npm install && npm run dev"
1 change: 1 addition & 0 deletions env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/// <reference types="vite/client" />
11 changes: 11 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import blumilkDefault from '@blumilksoftware/eslint-config'

overrides: [
{
files: ['**/*.cjs'],
parserOptions: {
sourceType: 'module'
}
}
]
export default [...blumilkDefault]
15 changes: 15 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>e-motion</title>
<style>*{font-family: ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";}
</style>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.ts"></script>
</body>
</html>
Loading