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

Hotfix for two bugs in the client #1414

Merged
merged 24 commits into from
Aug 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
0770b41
Insert link to GOAT technical documentation
Mar 2, 2022
19d7a74
Merge pull request #1320 from goat-community/dev
EPajares May 21, 2022
80a900c
Add issue templates
metemaddar Jun 30, 2022
8a53af3
Merge pull request #1363 from goat-community/metemaddar-issue-templates
EPajares Jun 30, 2022
1ee76a7
Create bug report form
metemaddar Jun 30, 2022
d7e8e8c
Merge pull request #1364 from goat-community/metemaddar-issue-templates
metemaddar Jun 30, 2022
1d5039f
[ADD] body key to the bug report form
metemaddar Jun 30, 2022
df0f486
[ADD] name and description to bug-report.yaml
metemaddar Jun 30, 2022
08d054c
[FIX] remove label and description from textarea
metemaddar Jun 30, 2022
d8defc9
[FIX] make name unique at bug-report.yaml
metemaddar Jun 30, 2022
f5fbc71
[FIX] replace makdowns with textarea
metemaddar Jun 30, 2022
4b7a186
[ADD] emojies to bug-report-form
metemaddar Jul 1, 2022
d23c88b
[FORMAT] Move emojies to the end of labels
metemaddar Jul 1, 2022
6e7d54e
[FORMAT] bug report form field descriptions
metemaddar Jul 1, 2022
d4ae686
[FIX] multiline value at bug report form
metemaddar Jul 1, 2022
7ea4ff0
[FIX] labels and title at bug report form
metemaddar Jul 1, 2022
c67f6da
[FORMAT] summary value at bug report form
metemaddar Jul 1, 2022
5e721c9
[ADD] a Pull Request Template
metemaddar Jul 1, 2022
6b1dcbf
[COMMENT] edit comments of PR template
metemaddar Jul 1, 2022
ecb7627
Update issue templates: Add branch to derive
metemaddar Jul 25, 2022
5f1d7e0
Update pull request template (related issue)
metemaddar Jul 25, 2022
4e2696d
Update README.md
EPajares Jul 26, 2022
98bbf61
The 2 bugs are fixed and ready to be merged with the main project
Ebubeker Aug 3, 2022
19ad9b2
Merge pull request #1413 from goat-community/bug_fixing
EPajares Aug 5, 2022
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
43 changes: 43 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: "Bug report form 🐛"
description: "Thank you for reporting a bug!"
labels: "Bug"
title: "[BUG] "
body:
- type: textarea
attributes:
label: Summary 📃
value: <!--- Provide a general summary of the issue -->
validations:
required: true
- type: textarea
attributes:
label: Expected Behaviour ✔
value: <!--- Tell us what should happen -->
validations:
required: true
- type: textarea
attributes:
label: Current Behaviour 🔦
value: <!--- Tell us what happens instead of the expected behavior -->
validations:
required: true
- type: textarea
attributes:
label: Possible Solution 💡
value: <!--- Not obligatory, but suggest a fix/reason for the bug, -->
- type: textarea
attributes:
label: Steps to reproduce 👣
value: |
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant -->
1.
2.
3.
4.
validations:
required: true
- type: textarea
attributes:
label: Possible Implementation 📐
value: <!--- Not obligatory, but suggest an idea for implementing addition or change -->
39 changes: 39 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: Bug
assignees: ''

---

<!--- Provide a general summary of the issue in the Title above -->

## Expected Behavior
<!--- Tell us what should happen -->

## Current Behavior
<!--- Tell us what happens instead of the expected behavior -->

## Possible Solution
<!--- Not obligatory, but suggest a fix/reason for the bug, -->

## Steps to Reproduce
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant -->
1.
2.
3.
4.

## Context (Environment)
<!--- How has this issue affected you? What are you trying to accomplish? -->
<!--- Providing context helps us come up with a solution that is most useful in the real world -->

<!--- Provide a general summary of the issue in the Title above -->

## Detailed Description
<!--- Provide a detailed description of the change or addition you are proposing -->

## Possible Implementation
<!--- Not obligatory, but suggest an idea for implementing addition or change -->
24 changes: 24 additions & 0 deletions .github/ISSUE_TEMPLATE/concrete-task-.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
name: 'Concrete Task '
about: Create a new task
title: ''
labels: ''
assignees: ''

---

# Goal of this issue

<!--- Clearly define the goal. -->

# Resources

<!--- Say which resources to use (e.g., where to find relevant code, papers, etc.). -->

# Deliverables

<!--- Clearly define deliverables. Mention deadlines if necessary. -->

# Branch to derive

<!--- Which branch to derive from? -->
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: New Feature
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
22 changes: 22 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!--- Provide a general summary of your changes in the Title above -->

## Description
<!--- Describe your changes in detail -->

## Motivation and Context
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->

## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->

## Screenshots (if appropriate):

## Related Issue
<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
<!--- Please link to the issue here: -->
<!--- Put "closes #XXXX" in your comment to auto-close the issue that your PR fixes (if such). -->

<!--- Attribution: https://github.com/stevemao/github-issue-templates -->
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ For more information:

[GOAT Docs](https://plan4better.de/docs/background/)

[GOAT Technical Docs](https://www.open-accessibility.org/docs/quick_start_docker/)

[GOAT demo versions](https://plan4better.de/goatlive/)

[Join GOAT User Group on Telegram](https://t.me/joinchat/EpAk7BYbIF72q7D3OTUCZQ)
Expand All @@ -37,3 +39,7 @@ Pajares, E.; Büttner, B.; Jehle, U.; Nichols, A.; Wulfhorst, G. Accessibility b
accessibility instruments for active mobility. J. Transp. Geogr. 2021, 93, 103080, https://doi.org/10.1016/j.jtrangeo.2021.103080.

Pajares, E.; Muñoz Nieto, R.; Meng, L.; Wulfhorst, G. Population Disaggregation on the Building Level Based on Outdated Census Data. ISPRS Int. J. Geo-Inf. 2021, 10, 662. https://doi.org/10.3390/ijgi10100662

Pajares, E., Jehle, U., 2021. GOAT: Ein interaktives Erreichbarkeitsinstrument zur Planung der 15-Minuten-Stadt, in: Flächennutzungsmonitoring XIII: Flächenpolitik - Konzepte - Analysen - Tools, IÖR Schriften. Rhombos-Verlag, Berlin, pp. 265–273. https://doi.org/10.26084/13dfns-p024

Jehle, U., Pajares, E., Analyse der Fußwegequalitäten zu Schulen – Entwicklung von Indikatoren auf Basis von OpenData. In: Meinel, G.; Krüger, T.; Behnisch, M.; Ehrhardt, D. (Hrsg.): Flächennutzungsmonitoring XIII: Flächenpolitik - Konzepte - Analysen - Tools. Berlin: Rhombos-Verlag, 2021, (IÖR-Schriften Band 79), S.221-232, https://doi.org/10.26084/13dfns-p020
12 changes: 11 additions & 1 deletion app/client/src/components/core/LeftPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,17 @@
>
<img id="app-logo" :src="logoText" width="120px" />
<v-spacer></v-spacer>
<v-btn text icon light @click.stop="mini = !mini">
<v-btn
text
icon
light
@click.stop="
() => {
topTabIndex = 0;
mini = !mini;
}
"
>
<v-icon small color="white">fas fa-chevron-left</v-icon>
</v-btn>
</v-app-bar>
Expand Down
35 changes: 25 additions & 10 deletions app/client/src/views/Auth.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<v-app id="inspire">
<v-content>
<v-container fluid fill-height class="pa-0">
<div style="width: 100%;">
<div style="width: 100%">
<div class="carousel-widget-wrapper">
<v-carousel
height="100vh"
Expand All @@ -26,7 +26,13 @@
class="ma-0"
justify="center"
align="center"
style="padding-top:60px;padding-bottom:60px;padding-left:35px;padding-right:35px;min-width:300px;"
style="
padding-top: 60px;
padding-bottom: 60px;
padding-left: 35px;
padding-right: 35px;
min-width: 300px;
"
>
<img src="img/goat_standard.svg" height="40px" />
</v-row>
Expand Down Expand Up @@ -94,7 +100,7 @@
<v-row class="mx-2 mt-n5 pt-0">
<v-spacer></v-spacer>
<router-link
style="z-index:2;color:#2BB381;text-decoration:none;"
style="z-index: 2; color: #2bb381; text-decoration: none"
to="/forgot-password"
>{{ $t("login.passwordForgotten") }}</router-link
>
Expand All @@ -118,7 +124,7 @@
{{ $t("login.noAccount") }}
</p>
<router-link
style="z-index:2;color:#2BB381;text-decoration:none;"
style="z-index: 2; color: #2bb381; text-decoration: none"
to="/register"
class="ml-2"
>
Expand Down Expand Up @@ -216,7 +222,11 @@
<v-row class="mx-2 mt-n5 pt-0">
<v-spacer></v-spacer>
<router-link
style="z-index:2;color:#2BB381;text-decoration:none;"
style="
z-index: 2;
color: #2bb381;
text-decoration: none;
"
to="/login"
>{{ $t("login.backToLogin") }}</router-link
>
Expand All @@ -231,7 +241,7 @@
{{ $t("login.agreeTerms") }} &nbsp;
<a
target="_blank"
style="color:#2BB381;text-decoration:none;"
style="color: #2bb381; text-decoration: none"
href="https://plan4better.de/en/privacy/"
@click.stop
>
Expand Down Expand Up @@ -297,7 +307,7 @@
<v-row class="mx-2 mt-n5 pt-0">
<v-spacer></v-spacer>
<router-link
style="z-index:2;color:#2BB381;text-decoration:none;"
style="z-index: 2; color: #2bb381; text-decoration: none"
to="/login"
>{{ $t("login.backToLogin") }}</router-link
>
Expand Down Expand Up @@ -369,7 +379,7 @@
<v-row class="mx-2 mt-n5 pt-0">
<v-spacer></v-spacer>
<router-link
style="z-index:2;color:#2BB381;text-decoration:none;"
style="z-index: 2; color: #2bb381; text-decoration: none"
to="/login"
>{{ $t("login.backToLogin") }}</router-link
>
Expand All @@ -395,7 +405,7 @@
<div class="mx-3">
<a href="https://plan4better.de/" target="_blank">
<img
style="cursor:pointer;"
style="cursor: pointer"
src="img/plan4better_standard.svg"
height="30px"
/>
Expand Down Expand Up @@ -526,6 +536,10 @@ export default {
});
},
submitRegisterForm() {
let languageToRegisterWith = "en";
if (this.$i18n.local === "de") {
languageToRegisterWith = "de";
}
this.$refs.authForm.validate();
this.$nextTick(() => {
if (!this.validForm) {
Expand All @@ -535,6 +549,7 @@ export default {
this.loading = true;
this.setMessage("");
this.setError("");

this.$store
.dispatch(`auth/${CREATE_USER}`, {
name: this.name,
Expand All @@ -544,7 +559,7 @@ export default {
occupation: this.occupation,
domain: this.domain,
newsletter: this.newsletter,
language_preference: this.$i18n.locale
language_preference: languageToRegisterWith
})
.then(
() => {
Expand Down