From 33583b806792c722ac080da6e945a6c18da35fd6 Mon Sep 17 00:00:00 2001 From: Artur Tamborski Date: Fri, 12 Aug 2022 23:59:05 +0200 Subject: [PATCH 1/2] add two missing migration files after bump to django 4.0 --- ...ter_refuel_total_cost_currency_and_more.py | 341 ++++++++++++++++++ ...lter_drive_id_alter_project_id_and_more.py | 48 +++ 2 files changed, 389 insertions(+) create mode 100644 backend/fleet_management/migrations/0026_alter_refuel_total_cost_currency_and_more.py create mode 100644 backend/fleet_management/migrations/0027_alter_car_id_alter_drive_id_alter_project_id_and_more.py diff --git a/backend/fleet_management/migrations/0026_alter_refuel_total_cost_currency_and_more.py b/backend/fleet_management/migrations/0026_alter_refuel_total_cost_currency_and_more.py new file mode 100644 index 00000000..f2a8b713 --- /dev/null +++ b/backend/fleet_management/migrations/0026_alter_refuel_total_cost_currency_and_more.py @@ -0,0 +1,341 @@ +# Generated by Django 4.0.6 on 2022-08-10 22:15 + +from django.db import migrations, models +import djmoney.models.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ("fleet_management", "0025_refuel"), + ] + + operations = [ + migrations.AlterField( + model_name="refuel", + name="total_cost_currency", + field=djmoney.models.fields.CurrencyField( + choices=[ + ("XUA", "ADB Unit of Account"), + ("AFN", "Afghan Afghani"), + ("AFA", "Afghan Afghani (1927–2002)"), + ("ALL", "Albanian Lek"), + ("ALK", "Albanian Lek (1946–1965)"), + ("DZD", "Algerian Dinar"), + ("ADP", "Andorran Peseta"), + ("AOA", "Angolan Kwanza"), + ("AOK", "Angolan Kwanza (1977–1991)"), + ("AON", "Angolan New Kwanza (1990–2000)"), + ("AOR", "Angolan Readjusted Kwanza (1995–1999)"), + ("ARA", "Argentine Austral"), + ("ARS", "Argentine Peso"), + ("ARM", "Argentine Peso (1881–1970)"), + ("ARP", "Argentine Peso (1983–1985)"), + ("ARL", "Argentine Peso Ley (1970–1983)"), + ("AMD", "Armenian Dram"), + ("AWG", "Aruban Florin"), + ("AUD", "Australian Dollar"), + ("ATS", "Austrian Schilling"), + ("AZN", "Azerbaijani Manat"), + ("AZM", "Azerbaijani Manat (1993–2006)"), + ("BSD", "Bahamian Dollar"), + ("BHD", "Bahraini Dinar"), + ("BDT", "Bangladeshi Taka"), + ("BBD", "Barbadian Dollar"), + ("BYN", "Belarusian Ruble"), + ("BYB", "Belarusian Ruble (1994–1999)"), + ("BYR", "Belarusian Ruble (2000–2016)"), + ("BEF", "Belgian Franc"), + ("BEC", "Belgian Franc (convertible)"), + ("BEL", "Belgian Franc (financial)"), + ("BZD", "Belize Dollar"), + ("BMD", "Bermudan Dollar"), + ("BTN", "Bhutanese Ngultrum"), + ("BOB", "Bolivian Boliviano"), + ("BOL", "Bolivian Boliviano (1863–1963)"), + ("BOV", "Bolivian Mvdol"), + ("BOP", "Bolivian Peso"), + ("BAM", "Bosnia-Herzegovina Convertible Mark"), + ("BAD", "Bosnia-Herzegovina Dinar (1992–1994)"), + ("BAN", "Bosnia-Herzegovina New Dinar (1994–1997)"), + ("BWP", "Botswanan Pula"), + ("BRC", "Brazilian Cruzado (1986–1989)"), + ("BRZ", "Brazilian Cruzeiro (1942–1967)"), + ("BRE", "Brazilian Cruzeiro (1990–1993)"), + ("BRR", "Brazilian Cruzeiro (1993–1994)"), + ("BRN", "Brazilian New Cruzado (1989–1990)"), + ("BRB", "Brazilian New Cruzeiro (1967–1986)"), + ("BRL", "Brazilian Real"), + ("GBP", "British Pound"), + ("BND", "Brunei Dollar"), + ("BGL", "Bulgarian Hard Lev"), + ("BGN", "Bulgarian Lev"), + ("BGO", "Bulgarian Lev (1879–1952)"), + ("BGM", "Bulgarian Socialist Lev"), + ("BUK", "Burmese Kyat"), + ("BIF", "Burundian Franc"), + ("XPF", "CFP Franc"), + ("KHR", "Cambodian Riel"), + ("CAD", "Canadian Dollar"), + ("CVE", "Cape Verdean Escudo"), + ("KYD", "Cayman Islands Dollar"), + ("XAF", "Central African CFA Franc"), + ("CLE", "Chilean Escudo"), + ("CLP", "Chilean Peso"), + ("CLF", "Chilean Unit of Account (UF)"), + ("CNX", "Chinese People’s Bank Dollar"), + ("CNY", "Chinese Yuan"), + ("CNH", "Chinese Yuan (offshore)"), + ("COP", "Colombian Peso"), + ("COU", "Colombian Real Value Unit"), + ("KMF", "Comorian Franc"), + ("CDF", "Congolese Franc"), + ("CRC", "Costa Rican Colón"), + ("HRD", "Croatian Dinar"), + ("HRK", "Croatian Kuna"), + ("CUC", "Cuban Convertible Peso"), + ("CUP", "Cuban Peso"), + ("CYP", "Cypriot Pound"), + ("CZK", "Czech Koruna"), + ("CSK", "Czechoslovak Hard Koruna"), + ("DKK", "Danish Krone"), + ("DJF", "Djiboutian Franc"), + ("DOP", "Dominican Peso"), + ("NLG", "Dutch Guilder"), + ("XCD", "East Caribbean Dollar"), + ("DDM", "East German Mark"), + ("ECS", "Ecuadorian Sucre"), + ("ECV", "Ecuadorian Unit of Constant Value"), + ("EGP", "Egyptian Pound"), + ("GQE", "Equatorial Guinean Ekwele"), + ("ERN", "Eritrean Nakfa"), + ("EEK", "Estonian Kroon"), + ("ETB", "Ethiopian Birr"), + ("EUR", "Euro"), + ("XBA", "European Composite Unit"), + ("XEU", "European Currency Unit"), + ("XBB", "European Monetary Unit"), + ("XBC", "European Unit of Account (XBC)"), + ("XBD", "European Unit of Account (XBD)"), + ("FKP", "Falkland Islands Pound"), + ("FJD", "Fijian Dollar"), + ("FIM", "Finnish Markka"), + ("FRF", "French Franc"), + ("XFO", "French Gold Franc"), + ("XFU", "French UIC-Franc"), + ("GMD", "Gambian Dalasi"), + ("GEK", "Georgian Kupon Larit"), + ("GEL", "Georgian Lari"), + ("DEM", "German Mark"), + ("GHS", "Ghanaian Cedi"), + ("GHC", "Ghanaian Cedi (1979–2007)"), + ("GIP", "Gibraltar Pound"), + ("XAU", "Gold"), + ("GRD", "Greek Drachma"), + ("GTQ", "Guatemalan Quetzal"), + ("GWP", "Guinea-Bissau Peso"), + ("GNF", "Guinean Franc"), + ("GNS", "Guinean Syli"), + ("GYD", "Guyanaese Dollar"), + ("HTG", "Haitian Gourde"), + ("HNL", "Honduran Lempira"), + ("HKD", "Hong Kong Dollar"), + ("HUF", "Hungarian Forint"), + ("IMP", "IMP"), + ("ISK", "Icelandic Króna"), + ("ISJ", "Icelandic Króna (1918–1981)"), + ("INR", "Indian Rupee"), + ("IDR", "Indonesian Rupiah"), + ("IRR", "Iranian Rial"), + ("IQD", "Iraqi Dinar"), + ("IEP", "Irish Pound"), + ("ILS", "Israeli New Shekel"), + ("ILP", "Israeli Pound"), + ("ILR", "Israeli Shekel (1980–1985)"), + ("ITL", "Italian Lira"), + ("JMD", "Jamaican Dollar"), + ("JPY", "Japanese Yen"), + ("JOD", "Jordanian Dinar"), + ("KZT", "Kazakhstani Tenge"), + ("KES", "Kenyan Shilling"), + ("KWD", "Kuwaiti Dinar"), + ("KGS", "Kyrgystani Som"), + ("LAK", "Laotian Kip"), + ("LVL", "Latvian Lats"), + ("LVR", "Latvian Ruble"), + ("LBP", "Lebanese Pound"), + ("LSL", "Lesotho Loti"), + ("LRD", "Liberian Dollar"), + ("LYD", "Libyan Dinar"), + ("LTL", "Lithuanian Litas"), + ("LTT", "Lithuanian Talonas"), + ("LUL", "Luxembourg Financial Franc"), + ("LUC", "Luxembourgian Convertible Franc"), + ("LUF", "Luxembourgian Franc"), + ("MOP", "Macanese Pataca"), + ("MKD", "Macedonian Denar"), + ("MKN", "Macedonian Denar (1992–1993)"), + ("MGA", "Malagasy Ariary"), + ("MGF", "Malagasy Franc"), + ("MWK", "Malawian Kwacha"), + ("MYR", "Malaysian Ringgit"), + ("MVR", "Maldivian Rufiyaa"), + ("MVP", "Maldivian Rupee (1947–1981)"), + ("MLF", "Malian Franc"), + ("MTL", "Maltese Lira"), + ("MTP", "Maltese Pound"), + ("MRU", "Mauritanian Ouguiya"), + ("MRO", "Mauritanian Ouguiya (1973–2017)"), + ("MUR", "Mauritian Rupee"), + ("MXV", "Mexican Investment Unit"), + ("MXN", "Mexican Peso"), + ("MXP", "Mexican Silver Peso (1861–1992)"), + ("MDC", "Moldovan Cupon"), + ("MDL", "Moldovan Leu"), + ("MCF", "Monegasque Franc"), + ("MNT", "Mongolian Tugrik"), + ("MAD", "Moroccan Dirham"), + ("MAF", "Moroccan Franc"), + ("MZE", "Mozambican Escudo"), + ("MZN", "Mozambican Metical"), + ("MZM", "Mozambican Metical (1980–2006)"), + ("MMK", "Myanmar Kyat"), + ("NAD", "Namibian Dollar"), + ("NPR", "Nepalese Rupee"), + ("ANG", "Netherlands Antillean Guilder"), + ("TWD", "New Taiwan Dollar"), + ("NZD", "New Zealand Dollar"), + ("NIO", "Nicaraguan Córdoba"), + ("NIC", "Nicaraguan Córdoba (1988–1991)"), + ("NGN", "Nigerian Naira"), + ("KPW", "North Korean Won"), + ("NOK", "Norwegian Krone"), + ("OMR", "Omani Rial"), + ("PKR", "Pakistani Rupee"), + ("XPD", "Palladium"), + ("PAB", "Panamanian Balboa"), + ("PGK", "Papua New Guinean Kina"), + ("PYG", "Paraguayan Guarani"), + ("PEI", "Peruvian Inti"), + ("PEN", "Peruvian Sol"), + ("PES", "Peruvian Sol (1863–1965)"), + ("PHP", "Philippine Peso"), + ("XPT", "Platinum"), + ("PLN", "Polish Zloty"), + ("PLZ", "Polish Zloty (1950–1995)"), + ("PTE", "Portuguese Escudo"), + ("GWE", "Portuguese Guinea Escudo"), + ("QAR", "Qatari Rial"), + ("XRE", "RINET Funds"), + ("RHD", "Rhodesian Dollar"), + ("RON", "Romanian Leu"), + ("ROL", "Romanian Leu (1952–2006)"), + ("RUB", "Russian Ruble"), + ("RUR", "Russian Ruble (1991–1998)"), + ("RWF", "Rwandan Franc"), + ("SVC", "Salvadoran Colón"), + ("WST", "Samoan Tala"), + ("SAR", "Saudi Riyal"), + ("RSD", "Serbian Dinar"), + ("CSD", "Serbian Dinar (2002–2006)"), + ("SCR", "Seychellois Rupee"), + ("SLL", "Sierra Leonean Leone"), + ("XAG", "Silver"), + ("SGD", "Singapore Dollar"), + ("SKK", "Slovak Koruna"), + ("SIT", "Slovenian Tolar"), + ("SBD", "Solomon Islands Dollar"), + ("SOS", "Somali Shilling"), + ("ZAR", "South African Rand"), + ("ZAL", "South African Rand (financial)"), + ("KRH", "South Korean Hwan (1953–1962)"), + ("KRW", "South Korean Won"), + ("KRO", "South Korean Won (1945–1953)"), + ("SSP", "South Sudanese Pound"), + ("SUR", "Soviet Rouble"), + ("ESP", "Spanish Peseta"), + ("ESA", "Spanish Peseta (A account)"), + ("ESB", "Spanish Peseta (convertible account)"), + ("XDR", "Special Drawing Rights"), + ("LKR", "Sri Lankan Rupee"), + ("SHP", "St. Helena Pound"), + ("XSU", "Sucre"), + ("SDD", "Sudanese Dinar (1992–2007)"), + ("SDG", "Sudanese Pound"), + ("SDP", "Sudanese Pound (1957–1998)"), + ("SRD", "Surinamese Dollar"), + ("SRG", "Surinamese Guilder"), + ("SZL", "Swazi Lilangeni"), + ("SEK", "Swedish Krona"), + ("CHF", "Swiss Franc"), + ("SYP", "Syrian Pound"), + ("STN", "São Tomé & Príncipe Dobra"), + ("STD", "São Tomé & Príncipe Dobra (1977–2017)"), + ("TVD", "TVD"), + ("TJR", "Tajikistani Ruble"), + ("TJS", "Tajikistani Somoni"), + ("TZS", "Tanzanian Shilling"), + ("XTS", "Testing Currency Code"), + ("THB", "Thai Baht"), + ( + "XXX", + "The codes assigned for transactions where no currency is involved", + ), + ("TPE", "Timorese Escudo"), + ("TOP", "Tongan Paʻanga"), + ("TTD", "Trinidad & Tobago Dollar"), + ("TND", "Tunisian Dinar"), + ("TRY", "Turkish Lira"), + ("TRL", "Turkish Lira (1922–2005)"), + ("TMT", "Turkmenistani Manat"), + ("TMM", "Turkmenistani Manat (1993–2009)"), + ("USD", "US Dollar"), + ("USN", "US Dollar (Next day)"), + ("USS", "US Dollar (Same day)"), + ("UGX", "Ugandan Shilling"), + ("UGS", "Ugandan Shilling (1966–1987)"), + ("UAH", "Ukrainian Hryvnia"), + ("UAK", "Ukrainian Karbovanets"), + ("AED", "United Arab Emirates Dirham"), + ("UYW", "Uruguayan Nominal Wage Index Unit"), + ("UYU", "Uruguayan Peso"), + ("UYP", "Uruguayan Peso (1975–1993)"), + ("UYI", "Uruguayan Peso (Indexed Units)"), + ("UZS", "Uzbekistani Som"), + ("VUV", "Vanuatu Vatu"), + ("VES", "Venezuelan Bolívar"), + ("VEB", "Venezuelan Bolívar (1871–2008)"), + ("VEF", "Venezuelan Bolívar (2008–2018)"), + ("VND", "Vietnamese Dong"), + ("VNN", "Vietnamese Dong (1978–1985)"), + ("CHE", "WIR Euro"), + ("CHW", "WIR Franc"), + ("XOF", "West African CFA Franc"), + ("YDD", "Yemeni Dinar"), + ("YER", "Yemeni Rial"), + ("YUN", "Yugoslavian Convertible Dinar (1990–1992)"), + ("YUD", "Yugoslavian Hard Dinar (1966–1990)"), + ("YUM", "Yugoslavian New Dinar (1994–2002)"), + ("YUR", "Yugoslavian Reformed Dinar (1992–1993)"), + ("ZWN", "ZWN"), + ("ZRN", "Zairean New Zaire (1993–1998)"), + ("ZRZ", "Zairean Zaire (1971–1993)"), + ("ZMW", "Zambian Kwacha"), + ("ZMK", "Zambian Kwacha (1968–2012)"), + ("ZWD", "Zimbabwean Dollar (1980–2008)"), + ("ZWR", "Zimbabwean Dollar (2008)"), + ("ZWL", "Zimbabwean Dollar (2009)"), + ], + default="USD", + editable=False, + max_length=3, + ), + ), + migrations.AlterField( + model_name="user", + name="first_name", + field=models.CharField( + blank=True, max_length=150, verbose_name="first name" + ), + ), + ] diff --git a/backend/fleet_management/migrations/0027_alter_car_id_alter_drive_id_alter_project_id_and_more.py b/backend/fleet_management/migrations/0027_alter_car_id_alter_drive_id_alter_project_id_and_more.py new file mode 100644 index 00000000..1ab68390 --- /dev/null +++ b/backend/fleet_management/migrations/0027_alter_car_id_alter_drive_id_alter_project_id_and_more.py @@ -0,0 +1,48 @@ +# Generated by Django 4.0.6 on 2022-08-10 22:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("fleet_management", "0026_alter_refuel_total_cost_currency_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="car", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="drive", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="project", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="refuel", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="user", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + ] From aea5a1277fc7d10e6b22cec8e740468b0a5746b0 Mon Sep 17 00:00:00 2001 From: Artur Tamborski Date: Sat, 13 Aug 2022 01:17:31 +0200 Subject: [PATCH 2/2] Simplify docker-compose setup, add hot reloading --- README.md | 3 +- backend/.dockerignore | 1 + backend/Dockerfile | 2 +- backend/docker-entrypoint.sh | 2 +- docker-compose.yml | 57 +++++++++----------------- frontend/.dockerignore | 1 + frontend/.env | 1 - .prettierrc => frontend/.prettierrc | 0 frontend/Dockerfile | 8 ++-- frontend/docker-entrypoint.sh | 4 +- pah-fm.conf | 63 ----------------------------- 11 files changed, 29 insertions(+), 113 deletions(-) create mode 100644 backend/.dockerignore delete mode 100644 frontend/.env rename .prettierrc => frontend/.prettierrc (100%) delete mode 100644 pah-fm.conf diff --git a/README.md b/README.md index 04e61195..c7517be0 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ [Fleet Manager](https://en.wikipedia.org/wiki/Fleet_management) for [Polish Humanitarian Action](https://www.pah.org.pl). -[![Build Status](https://travis-ci.com/CodeForPoznan/pah-fm.svg?branch=master)](https://travis-ci.com/CodeForPoznan/pah-fm) [![Join Slack](https://img.shields.io/badge/slack-join%20chat-4a154b)](https://join.slack.com/t/codeforpoznan/shared_invite/enQtNjQ5MTU1MDI0NDA0LWNhYTA3NGQ0MmQ5ODgxODE3ODJlZjc3NWE0NTMzZjhmNDBkN2QwMzNhYWY5OWQ5MGE2OGM3NjAyODBlY2VjNjU) @@ -72,7 +71,7 @@ Here's a high-level description of the project's structure: - frontend - `main purpose:` Interactive interface for application - `language:` JavaScript - - `framework:` React + - `framework:` React.js
diff --git a/backend/.dockerignore b/backend/.dockerignore new file mode 100644 index 00000000..1d17dae1 --- /dev/null +++ b/backend/.dockerignore @@ -0,0 +1 @@ +.venv diff --git a/backend/Dockerfile b/backend/Dockerfile index 66272220..e82a9c38 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -15,7 +15,7 @@ COPY Pipfile Pipfile.lock ./ RUN pip install --upgrade pip \ && pip install pipenv==2022.1.8 \ - && pipenv sync --system --dev + && pipenv install --system --dev ADD . /pah-fm/backend diff --git a/backend/docker-entrypoint.sh b/backend/docker-entrypoint.sh index 01eb3776..b6a7e452 100644 --- a/backend/docker-entrypoint.sh +++ b/backend/docker-entrypoint.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -wait-for-it db:5432 +wait-for-it database:5432 ./manage.py migrate ./manage.py create_admin hello@codeforpoznan.pl pass123 UA --django-admin diff --git a/docker-compose.yml b/docker-compose.yml index c208fabb..386c3edf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,40 +1,37 @@ -version: "3.5" +version: "3" + services: frontend: - networks: [pah] + container_name: pah-fm-frontend image: codeforpoznan/pah-fm-frontend - # used for local frontend build (enables service worker etc) - # environment: - # NODE_ENV: production - command: bash docker-entrypoint.sh + ports: + - 8080:8080 volumes: - ./frontend:/pah-fm/frontend - - asset-volume:/pah-fm/frontend/dist - depends_on: - - webserver + environment: + VUE_APP_API_URL: http://localhost:8000/api/ backend: - networks: [pah] + container_name: pah-fm-backend image: codeforpoznan/pah-fm-backend - command: bash docker-entrypoint.sh stdin_open: true tty: true + links: + - database:database ports: - - 4444:4444 + - 8000:8000 + volumes: + - ./backend:/pah-fm/backend environment: - BASE_URL: http://localhost:8080 - PAH_FM_DB_HOST: db + BASE_URL: http://localhost:8000 + PAH_FM_DB_HOST: database SECRET_KEY: pah-fm DEBUG: 1 - DJANGO_LOG_LEVEL: 'DEBUG' - links: - - db:db - volumes: - - ./backend:/pah-fm/backend + DJANGO_LOG_LEVEL: DEBUG - db: - networks: [pah] + database: + container_name: pah-fm-database image: postgres:14.4 ports: - 5432:5432 @@ -42,21 +39,3 @@ services: POSTGRES_DB: pah-fm POSTGRES_USER: pah-fm POSTGRES_PASSWORD: pah-fm - - webserver: - networks: [pah] - image: nginx - volumes: - - ./pah-fm.conf:/etc/nginx/nginx.conf - - asset-volume:/var/www/:ro - ports: - - 8080:80 - depends_on: - - backend - -volumes: - asset-volume: - -networks: - pah: - name: pah diff --git a/frontend/.dockerignore b/frontend/.dockerignore index 3c3629e6..76add878 100644 --- a/frontend/.dockerignore +++ b/frontend/.dockerignore @@ -1 +1,2 @@ node_modules +dist \ No newline at end of file diff --git a/frontend/.env b/frontend/.env deleted file mode 100644 index 102d5818..00000000 --- a/frontend/.env +++ /dev/null @@ -1 +0,0 @@ -VUE_APP_API_URL="/api/" diff --git a/.prettierrc b/frontend/.prettierrc similarity index 100% rename from .prettierrc rename to frontend/.prettierrc diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 11660295..bd785c44 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,11 +1,13 @@ FROM node:8.12.0 -EXPOSE 4200 +EXPOSE 8080 WORKDIR /pah-fm/frontend -ADD package*.json /pah-fm/frontend/ +COPY package.json package-lock.json ./ RUN npm install -ADD . /pah-fm/frontend +ADD ./ ./ + +ENTRYPOINT ["bash", "docker-entrypoint.sh"] \ No newline at end of file diff --git a/frontend/docker-entrypoint.sh b/frontend/docker-entrypoint.sh index 01ae7894..a62b8bb6 100644 --- a/frontend/docker-entrypoint.sh +++ b/frontend/docker-entrypoint.sh @@ -1,5 +1,3 @@ #!/usr/bin/env bash -npm install -rm -rf /pah-fm/frontend/dist/* || true -npm run watch +npm run serve diff --git a/pah-fm.conf b/pah-fm.conf deleted file mode 100644 index da201e10..00000000 --- a/pah-fm.conf +++ /dev/null @@ -1,63 +0,0 @@ -user nginx; -worker_processes 1; - -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; - -events { - worker_connections 1024; ## Default: 1024, increase if you have lots of clients -} - -http { - include /etc/nginx/mime.types; - # fallback in case we can't determine a type - default_type application/octet-stream; - - gzip on; - gzip_min_length 1000; - gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml application/javascript; - gzip_proxied any; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - #tcp_nopush on; - - keepalive_timeout 65; - - upstream app { - server backend:8000; - } - - server { - # use 'listen 80 deferred;' for Linux - # use 'listen 80 accept_filter=httpready;' for FreeBSD - listen 80; - charset utf-8; - - # Handle noisy favicon.ico messages in nginx - location = /favicon.ico { - return 204; - access_log off; - log_not_found off; - } - - location ~ ^/(static|media|api|admin) { - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - proxy_pass http://app; - } - - location / { - root /var/www; - try_files $uri $uri/ /index.html; - } - } -}