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

maintenance/updates-may #176

Merged
merged 30 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3121c27
Detect django apps
jrcarretas Apr 12, 2024
956b914
Grants app cleanup
jrcarretas Apr 12, 2024
6077911
Include linting section in readme
jrcarretas Apr 12, 2024
03a7a9c
More linting fixes
jrcarretas Apr 12, 2024
1e74170
Linting fixes for users app and refactors
jrcarretas Apr 12, 2024
fc94f60
Merge pull request #505 from countable-web/grants-cleanup
jrcarretas Apr 12, 2024
e99f914
Cleaned up web app
jrcarretas Apr 12, 2024
3b943cc
Merge pull request #506 from countable-web/users-cleanup
jrcarretas Apr 12, 2024
fab5b07
Merge pull request #507 from countable-web/web-cleanup
jrcarretas Apr 12, 2024
252821f
Replace mapbox source with FPCC's (previously Countable's)
jrcarretas May 9, 2024
e234aaf
Merge pull request #508 from countable-web/update/mapbox-source
jrcarretas May 9, 2024
dd3d1ec
Cleaned up code in web app
jrcarretas May 10, 2024
4fe908c
Imports clean up
jrcarretas May 10, 2024
4435966
Import clean up
jrcarretas May 10, 2024
5ec8384
Import clean up
jrcarretas May 10, 2024
3d10bd9
Code clean up and fixed useless test
jrcarretas May 10, 2024
8b17339
Code clean up
jrcarretas May 10, 2024
f2d120e
Minor test improvements and cleaned up code
jrcarretas May 10, 2024
51e1e22
Refactors and clean up
jrcarretas May 10, 2024
338182f
Refactors and clean up
jrcarretas May 10, 2024
ba6128a
Minor clean up
jrcarretas May 10, 2024
8ee6917
Merge pull request #509 from countable-web/april-cleanup
jrcarretas May 10, 2024
356e92e
[update] changed language source
bomiku May 11, 2024
43fb936
[update] added hash for files to not cache files
bomiku May 11, 2024
94e916b
[update] if backslash exists, remove it
bomiku May 11, 2024
72a5922
[update] map button adjustments
bomiku May 11, 2024
bb8ee80
Merge pull request #510 from countable-web/updates/may
bomiku May 11, 2024
b1306b8
[update] icon size changed
bomiku May 11, 2024
c969936
Merge pull request #511 from countable-web/updates/may
bomiku May 11, 2024
57d43fe
Merge pull request #512 from countable-web/develop
jrcarretas Jun 26, 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
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,20 @@ docker-compose exec web python manage.py test

```
## Linting
### Python
We use pylint to detect linting errors in Python. Disclaimer: pylint is only used to detect errors an does not automatically fix them. Linting fixes have to be manually applied by the developer.
```
# Linting for entire folder
docker-compose exec web sh pylint.sh <folder_name>

# Linting for specific file
docker-compose exec web sh pylint.sh <folder_name>/<file_name>/
```
### Notifications
The system sends users notifications weekly, including:
Expand Down
3 changes: 3 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ services:
- back-tier
working_dir: /code/
command: ./command.sh
environment:
- MAPBOX_ACCESS_TOKEN=pk.eyJ1IjoiZnBjYyIsImEiOiJjbHJ6Y2RrZ2kxa3NlMndsemNqbTMwajk3In0.Ptmj4UY9iIzIO3UVPpaOUg
- MAPBOX_STYLE_URL=mapbox://styles/fpcc/cls0kyxqh00b301pvb06p0r07/?optimize=true

test:
image: alekzonder/puppeteer:latest
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/AddToTheMap.vue
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ export default {
margin: 0;
padding: 0.5em 2em;
font-weight: 800;
font-size: 15px;
font-size: 12px;
color: #ffffff;
text-transform: uppercase;
animation: shadowpulse 5s ease infinite;
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/CurrentLocation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default {
}
.current-location-control h5 {
font-weight: 800;
font-size: 15px;
font-size: 12px;
color: #151515;
margin: 0;
padding: 0.5em 0.75em;
Expand Down
8 changes: 4 additions & 4 deletions frontend/components/Event.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@ export default {
justify-content: center;
align-items: center;
background-color: white;
padding: 0.6em;
padding: 0.5em;
border-radius: 1.5em;
z-index: 50;
margin-right: 0.5em;
box-shadow: 0px 3px 6px #00000022;
border: 1px solid #beb2a5;
color: #151515;
font-weight: 800;
font-size: 15px;
font-size: 12px;

.menu-icon {
width: 18px;
height: 18px;
width: 15px;
height: 15px;
}

.arts-container & {
Expand Down
14 changes: 6 additions & 8 deletions frontend/components/NavigationBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -375,14 +375,13 @@ export default {
background-color: white;
z-index: 50;
border: 1px solid #beb2a5;
padding: 0.6em;
padding: 0.85em;
border-radius: 1.5em;
margin-right: 0.5em;
box-shadow: 0px 3px 6px #00000022;
color: #151515;
font-weight: 800;
font-size: 15px;
height: 47px;
font-size: 12px;
position: relative;

nav {
Expand All @@ -397,15 +396,14 @@ export default {
}

img {
width: 18px;
height: 18px;
width: 15px;
height: 15px;
}

.user-icon-container {
position: relative;
display: flex;
align-items: center;
height: 45px;
letter-spacing: 1px;

.user-display-img {
Expand All @@ -418,8 +416,8 @@ export default {
}

.user-icon {
width: 18px;
height: 18px;
width: 15px;
height: 15px;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/ResetMap.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default {
}
.reset-map-control h5 {
font-weight: 800;
font-size: 15px;
font-size: 12px;
color: #151515;
margin: 0;
padding: 0.5em 0.75em;
Expand Down
Loading
Loading