Elijah Lucian 3 years ago
parent 8c40f30286
commit 486955a861
  1. 43
      devops/nginx/nginx-static.conf
  2. 6
      docker-compose.yml
  3. 20214
      frontend/package-lock.json
  4. 3
      frontend/package.json
  5. 4
      frontend/public/index.html
  6. BIN
      frontend/public/logo192.png
  7. BIN
      frontend/public/logo512.png
  8. 4
      frontend/public/manifest.json
  9. 10
      frontend/src/api/data/users.ts
  10. 50
      frontend/src/scss/app.scss.old
  11. 77
      frontend/yarn.lock

@ -0,0 +1,43 @@
worker_processes 1;
events { worker_connections 1024; }
http {
# upstream client {
# server frontend:3000;
# }
server {
listen 80;
error_log /var/log/nginx/error.log;
access_log /var/log/nginx/access.log;
client_max_body_size 10M;
index index.html;
root /var/www/html;
location / {
try_files $uri $uri/ /index.html =404;
}
location /api {
proxy_pass http://server:8000;
rewrite ^/api(.*)$ $1 break;
}
location /cable {
proxy_pass http://server:8000;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
# rewrite ^/cable(.*)$ $1 break;
}
location /socksjs-node {
proxy_pass http://server:8000;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
# rewrite ^/cable(.*)$ $1 break;
}
}
}

@ -9,6 +9,7 @@ services:
- server
volumes:
- ./devops/nginx/nginx.conf:/etc/nginx/nginx.conf
# - ./frontend/build:/var/www/html
ports:
- 80:80
- 443:443
@ -18,7 +19,6 @@ services:
context: ./frontend
volumes:
- ./frontend/src:/usr/src/frontend/src
- ./frontend/public:/usr/src/frontend/public
ports:
- 3000:3000
environment:
@ -28,8 +28,8 @@ services:
server:
build:
context: ./server
volumes:
- ./server:/usr/src/server
# volumes:
# - ./server:/usr/src/server
ports:
- 8000:8000
command: ["python", "manage.py", "runserver", "0.0.0.0:8000"]

File diff suppressed because it is too large Load Diff

@ -19,13 +19,14 @@
"react-dom": "^17.0.1",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"typescript": "^4.1.2",
"typescript": "^4.1.5",
"web-vitals": "^1.0.1"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"deploy": "npm run build && mv ./build ../server/static",
"lint": "tsc",
"eject": "react-scripts eject"
},

@ -4,7 +4,7 @@
<meta charset="utf-8" />
<link
rel="icon"
href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>💎</text></svg>"
href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>💵</text></svg>"
/>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>MVP Django React</title>
<title>CashStacks</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

@ -1,6 +1,6 @@
{
"short_name": "EZ MVP",
"name": "MVP Django React",
"short_name": "CashStacks",
"name": "cash-dash-stacks",
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",

@ -1,12 +1,14 @@
import { DataBuddy } from '@dank-inc/data-buddy'
import { User } from '../../types'
import { Account, Stack, Transaction, User } from '../../types'
const userRecords: User[] = [
export const users = new DataBuddy<User>([
{
id: '42',
name: 'TestUser42',
email: 'testuser@email.com',
},
]
])
export const users = new DataBuddy(userRecords)
export const accounts = new DataBuddy<Account>([])
export const stacks = new DataBuddy<Stack>([])
export const transactions = new DataBuddy<Transaction>([])

@ -1,50 +0,0 @@
.ant-layout-header.app-header {
display: flex;
flex-direction: row;
justify-content: space-between;
vertical-align: middle;
padding: 0 1rem;
a {
font-size: 1.2rem;
font-weight: bold;
}
div {
display: flex;
vertical-align: middle;
height: 100%;
* {
margin: auto 0.5rem;
}
}
h3.ant-typography {
margin: auto 0 !important;
}
div.ant-typography {
font-size: 1.6rem;
}
}
.ant-layout.layout {
min-height: 100vh;
// background-color: #444;
// color: white;
}
.ant-avatar {
display: flex;
* {
margin: auto;
padding: 0;
}
}
.ant-layout-content {
max-width: 900px;
margin: auto;
}

@ -1204,6 +1204,11 @@
"resolved" "https://registry.npmjs.org/@dank-inc/data-buddy/-/data-buddy-0.1.4.tgz"
"version" "0.1.4"
"@dank-inc/use-get@^0.3.1":
"integrity" "sha512-O7QREvSarFsARw+DKRip0bTuGRMjlKqQ31FdSq+8tgsBiUDXJQ1OEdumT18mK9DRG4VmVqrvQrxTKcH10cIwxw=="
"resolved" "https://registry.npmjs.org/@dank-inc/use-get/-/use-get-0.3.1.tgz"
"version" "0.3.1"
"@eslint/eslintrc@^0.3.0":
"integrity" "sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg=="
"resolved" "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"
@ -2461,7 +2466,7 @@
"micromatch" "^3.1.4"
"normalize-path" "^2.1.1"
"anymatch@^3.0.3", "anymatch@~3.1.1":
"anymatch@^3.0.3":
"integrity" "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="
"resolved" "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"
"version" "3.1.1"
@ -2969,11 +2974,6 @@
"resolved" "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"
"version" "1.13.1"
"binary-extensions@^2.0.0":
"integrity" "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
"resolved" "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
"version" "2.2.0"
"bluebird@^3.5.5":
"integrity" "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
"resolved" "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"
@ -3056,7 +3056,7 @@
"split-string" "^3.0.2"
"to-regex" "^3.0.1"
"braces@^3.0.1", "braces@~3.0.2":
"braces@^3.0.1":
"integrity" "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="
"resolved" "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
"version" "3.0.2"
@ -3462,20 +3462,6 @@
optionalDependencies:
"fsevents" "^1.2.7"
"chokidar@^3.4.1":
"integrity" "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="
"resolved" "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"
"version" "3.5.1"
dependencies:
"anymatch" "~3.1.1"
"braces" "~3.0.2"
"fsevents" "~2.3.1"
"glob-parent" "~5.1.0"
"is-binary-path" "~2.1.0"
"is-glob" "~4.0.1"
"normalize-path" "~3.0.0"
"readdirp" "~3.5.0"
"chownr@^1.1.1":
"integrity" "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
"resolved" "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"
@ -5542,18 +5528,6 @@
"resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
"version" "1.0.0"
"fsevents@^1.2.7":
"integrity" "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="
"resolved" "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz"
"version" "1.2.13"
dependencies:
"nan" "^2.12.1"
"fsevents@^2.1.2", "fsevents@^2.1.3", "fsevents@~2.3.1":
"integrity" "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="
"resolved" "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"
"version" "2.3.2"
"function-bind@^1.1.1":
"integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
"resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
@ -5653,7 +5627,7 @@
"is-glob" "^3.1.0"
"path-dirname" "^1.0.0"
"glob-parent@^5.0.0", "glob-parent@^5.1.0", "glob-parent@~5.1.0":
"glob-parent@^5.0.0", "glob-parent@^5.1.0":
"integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="
"resolved" "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
"version" "5.1.2"
@ -6308,13 +6282,6 @@
dependencies:
"binary-extensions" "^1.0.0"
"is-binary-path@~2.1.0":
"integrity" "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="
"resolved" "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"
"version" "2.1.0"
dependencies:
"binary-extensions" "^2.0.0"
"is-boolean-object@^1.1.0":
"integrity" "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA=="
"resolved" "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz"
@ -6465,7 +6432,7 @@
dependencies:
"is-extglob" "^2.1.0"
"is-glob@^4.0.0", "is-glob@^4.0.1", "is-glob@~4.0.1":
"is-glob@^4.0.0", "is-glob@^4.0.1":
"integrity" "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="
"resolved" "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"
"version" "4.0.1"
@ -7946,7 +7913,7 @@
"dns-packet" "^1.3.1"
"thunky" "^1.0.2"
"nan@^2.12.1", "nan@^2.13.2":
"nan@^2.13.2":
"integrity" "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
"resolved" "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz"
"version" "2.14.2"
@ -8136,7 +8103,7 @@
dependencies:
"remove-trailing-separator" "^1.0.1"
"normalize-path@^3.0.0", "normalize-path@~3.0.0":
"normalize-path@^3.0.0":
"integrity" "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
"resolved" "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
"version" "3.0.0"
@ -10407,13 +10374,6 @@
"micromatch" "^3.1.10"
"readable-stream" "^2.0.2"
"readdirp@~3.5.0":
"integrity" "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="
"resolved" "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"
"version" "3.5.0"
dependencies:
"picomatch" "^2.2.1"
"recursive-readdir@2.2.2":
"integrity" "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="
"resolved" "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"
@ -12118,10 +12078,10 @@
"resolved" "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
"version" "0.0.6"
"typescript@^4.1.2":
"integrity" "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw=="
"resolved" "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz"
"version" "4.2.3"
"typescript@^4.1.5":
"integrity" "sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA=="
"resolved" "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz"
"version" "4.1.5"
"unbox-primitive@^1.0.0":
"integrity" "sha512-P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA=="
@ -12418,13 +12378,6 @@
dependencies:
"loose-envify" "^1.0.0"
"watchpack-chokidar2@^2.0.1":
"integrity" "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww=="
"resolved" "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz"
"version" "2.0.1"
dependencies:
"chokidar" "^2.1.8"
"watchpack@^1.7.4":
"integrity" "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ=="
"resolved" "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz"

Loading…
Cancel
Save