Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Mercedes #2259

Merged
merged 46 commits into from
Jan 21, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
cc9b8c9
Add Mercedes api
andig Apr 28, 2021
1295b38
wip
andig Apr 28, 2021
4644a07
wip
andig Apr 28, 2021
e90e910
fix authorization code flow
Jan 10, 2022
4303b74
style
Jan 10, 2022
38168c7
style
Jan 10, 2022
7f52bdf
style
Jan 10, 2022
f085335
update
Jan 10, 2022
276a9d4
add comment
Jan 10, 2022
f8f8097
provide alogout
Jan 11, 2022
4bc60c7
style
Jan 11, 2022
e4d13e4
refactor
Jan 11, 2022
0c5441e
make ui
Jan 11, 2022
0213d46
Merge branch 'master' into feature/mercedes2
Jan 11, 2022
33a4aff
Merge branch 'master' into feature/mercedes2
Jan 11, 2022
72cd57b
go mod update
Jan 11, 2022
517f91c
cleanup
Jan 11, 2022
8a20b01
cleanup
Jan 11, 2022
d7f182c
make ui
Jan 11, 2022
103a372
Conditional login and language
Jan 11, 2022
39c3a14
cleanup
Jan 11, 2022
46ddff8
cleanup
Jan 11, 2022
3c6ac2b
revert observation_id_enumer
Jan 11, 2022
165cbfd
...
Jan 11, 2022
418b0c5
add site config
Jan 12, 2022
dd0fbf3
Merge branch 'master' into feature/mercedes2
Jan 13, 2022
dc6b07b
fix
Jan 13, 2022
82b1b43
fix
Jan 13, 2022
5a84ade
add missing identity
Jan 13, 2022
a74edd5
rm mux dependency
Jan 14, 2022
8db7ef4
Update .dockerignore
xantalor Jan 14, 2022
195eaca
Update dacia.yaml
xantalor Jan 14, 2022
131298d
axios update
Jan 15, 2022
267efb7
Merge branch 'feature/mercedes2' of github.com:evcc-io/evcc into feat…
Jan 15, 2022
cceccdf
rename
Jan 15, 2022
55a4551
update error message
Jan 15, 2022
985e5b8
build ui and move authapi
Jan 15, 2022
fd38394
lint
Jan 15, 2022
eb346a4
ling2
Jan 15, 2022
55356e5
update
Jan 17, 2022
6321099
introduce login menu
Jan 21, 2022
e34f14a
build production ui
Jan 21, 2022
71e32a1
small ui change
Jan 21, 2022
c7c344a
fix comments
Jan 21, 2022
65f12a6
refactor
Jan 21, 2022
3573df3
refactor
Jan 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Merge branch 'master' into feature/mercedes2
and fixes to get a working state
  • Loading branch information
xantalor committed Jan 11, 2022
commit 0213d46fec6faacffaa3c73c0f3e73517146bdd9
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*.sh
*.yaml
Dockerfile
dist
xantalor marked this conversation as resolved.
Show resolved Hide resolved
node_modules
release
!entrypoint.sh
Expand Down
6 changes: 5 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ module.exports = {
},
extends: [
"eslint:recommended",
"plugin:vue/essential",
"plugin:vue/recommended",
"plugin:prettier/recommended",
"prettier",
],
rules: {
"vue/require-default-prop": "off",
"vue/attribute-hyphenation": "off",
},
};
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Show output of <code>evcc -v</code>:

</pre></details>

<details><summary>Show evcc log output with <code>--log trace</code>:</summary><br><pre>
<details><summary>Show evcc log output with <code>--log debug</code>:</summary><br><pre>
<- paste here

</pre></details>
Expand Down
192 changes: 0 additions & 192 deletions .github/workflows/build.yml

This file was deleted.

93 changes: 93 additions & 0 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
name: Default

on: [push, pull_request, workflow_call]

jobs:

build:
name: Build
runs-on: ubuntu-latest

steps:
- name: Setup
uses: actions/setup-go@v2
with:
go-version: ^1.16
id: go

- name: Cache Go modules
uses: actions/cache@v2
with:
path: |
~/go/pkg/mod
~/.cache/go-build
key: ${{ runner.os }}-${{ matrix.go-version }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-${{ matrix.go-version }}-go-

- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: gofmt
run: |
gofmt -w -l $(find . -name '*.go')

- name: Install tools
run: make install

- name: Assets
run: make assets

- name: Porcelain
run: |
go mod tidy
test -z "$(git status --porcelain)" || (git status; git diff; false)

- name: Build
run: make build

- name: Lint
uses: golangci/golangci-lint-action@v2
with:
version: latest
skip-go-installation: true
skip-pkg-cache: true
skip-build-cache: true

- name: Test
run: make test

build-ui:
name: Build UI
runs-on: ubuntu-latest

steps:
- name: Cache NPM modules
uses: actions/cache@v2
with:
path: |
**/node_modules
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-npm-

- name: Checkout
uses: actions/checkout@v2

- name: Install tools
run: make install-ui

- name: Build
run: make ui

- name: Lint
run: make lint-ui

- name: Test
run: make test-ui

- name: Porcelain
run: |
test -z "$(git status --porcelain)" || (git status; git diff; false)
Loading