Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
suricactus committed Jul 3, 2023
2 parents 125f433 + d7941b3 commit 59791f4
Show file tree
Hide file tree
Showing 19 changed files with 913 additions and 62 deletions.
10 changes: 10 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Handle line endings automatically for files detected as text
# and leave all files detected as binary untouched.
* text=auto

#
# The above will handle all files NOT found below
#
# These files are text and should be normalized (Convert crlf => lf)
*.bash text eol=lf
*.sh text eol=lf
11 changes: 10 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ jobs:
test:
name: Run tests
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
django_apps:
- authentication
- notifs
- subscription
- core
continue-on-error: true
steps:
- name: Checkout repo
uses: actions/checkout@v3
Expand Down Expand Up @@ -59,7 +68,7 @@ jobs:
docker compose run app python manage.py collectstatic
- name: Run unit and integration tests
run: |
docker compose run app python manage.py test --keepdb -v2 qfieldcloud
docker compose run app python manage.py test --keepdb -v2 qfieldcloud.${{ matrix.django_apps }}
- name: "failure logs"
if: failure()
Expand Down
12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ debugpy.wait_for_client() # optional

Or alternativley, prefix your commands with `python -m debugpy --listen 0.0.0.0:5680 --wait-for-client`.

docker compose run app -p 5680:5680 python -m debugpy --listen 0.0.0.0:5680 --wait-for-client manage.py test
docker compose run worker_wrapper -p 5681:5681 python -m debugpy --listen 0.0.0.0:5681 --wait-for-client manage.py test
docker compose run -p 5680:5680 app python -m debugpy --listen 0.0.0.0:5680 --wait-for-client manage.py test
docker compose run -p 5681:5681 worker_wrapper python -m debugpy --listen 0.0.0.0:5681 --wait-for-client manage.py test

Note if you run tests using the `docker-compose.test.yml` configuration, the `app` and `worker-wrapper` containers expose ports `5680` and `5681` respectively.

Expand Down Expand Up @@ -302,6 +302,14 @@ users. The template db has the following extensions installed:

You can use either the integrated `minio` object storage, or use an external provider (e. g. S3) with versioning enabled. Check the corresponding `STORAGE_*` environment variables for more info.

## Collaboration

Contributions welcome!

Any PR including the `[WIP]` should be:
- able to be checked-out without breaking the stack;
- the specific feature being developed/modified should be testable locally (does not mean it should work correctly).

## Resources

- [QField Cloud "marketing" page](https://qfield.cloud)
Expand Down
197 changes: 193 additions & 4 deletions conf/nginx/pages/403.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,201 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>403 Forbidden</title>
<title>Error 403 - Forbidden </title>
</head>
<body bgcolor="white">
<center><h1>403 Forbidden</h1></center>

<body>
<div class="container text-center">
<img src="sad_nyuki.svg" alt="Sad Nyuki" class="mt-5 mb-4">
<h1 class="display-4">403</h1>
<p class="lead">Forbidden</p>
<p>Sorry, but you don't have permission to access this page or resource.</p>
<a href="/" class="btn btn-primary mt-3">Go back to Home</a>
</div>
<style>
/* exported from 'https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css' */
body {
font-family: -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";
font-size: 1rem;
font-weight: 400;
line-height: 1.5;
color: #212529;
text-align: left;
}

.lead {
font-size: 1.25rem;
font-weight: 300;
}

p {
margin-top: 0;
margin-bottom: 1rem;
}

.btn {
display: inline-block;
font-weight: 400;
color: #212529;
text-align: center;
vertical-align: middle;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
background-color: transparent;
border: 1px solid transparent;
border-top-color: transparent;
border-right-color: transparent;
border-bottom-color: transparent;
border-left-color: transparent;
padding: .375rem .75rem;
font-size: 1rem;
line-height: 1.5;
border-radius: .25rem;
transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
}

.btn:not(:disabled):not(.disabled) {
cursor: pointer;
}

.mt-3,
.my-3 {
margin-top: 1rem !important;
}


.mt-5,
.my-5 {
margin-top: 3rem !important;
}

.mb-4,
.my-4 {
margin-bottom: 1.5rem !important;
}

img {
vertical-align: middle;
border-style: none;
}

*,
::after,
::before {
box-sizing: border-box;
}

.display-4 {
font-size: 3.5rem;
font-weight: 300;
line-height: 1.2;
}

.h1,
.h2,
.h3,
.h4,
.h5,
.h6,
h1,
h2,
h3,
h4,
h5,
h6 {
margin-bottom: .5rem;
font-weight: 500;
line-height: 1.2;
}

h1,
h2,
h3,
h4,
h5,
h6 {
margin-top: 0;
margin-bottom: .5rem;
}

*,
::after,
::before {
box-sizing: border-box;
}

.text-center {
text-align: center !important;
}

@media (min-width: 992px) {

.container,
.container-lg,
.container-md,
.container-sm {
max-width: 960px;
}
}

@media (min-width: 768px) {

.container,
.container-md,
.container-sm {
max-width: 720px;
}
}

@media (min-width: 576px) {

.container,
.container-sm {
max-width: 540px;
}
}

.container,
.container-fluid,
.container-lg,
.container-md,
.container-sm,
.container-xl {
width: 100%;
padding-right: 15px;
padding-left: 15px;
margin-right: auto;
margin-left: auto;
}

/* added qfc style */
a {
color: #4a6fae;
text-decoration: none;
}

a :hover {
color: #3f5e93;
}

.btn-primary {
color: #fff;
background-color: #4a6fae;
border-color: #4a6fae;
}

.btn-primary:hover {
color: #fff;
background-color: #3f5e93;
border-color: #3b588a;
}
</style>

</body>

</html>
Loading

0 comments on commit 59791f4

Please sign in to comment.