Skip to content

Commit

Permalink
Merge branch 'main' into dancyy/160-add-sqlite-instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
avenmia authored Nov 23, 2023
2 parents 9704d70 + fb354db commit 3eac92a
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 15 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:
- run: npm ci
- name: Create .env file
run: cp -f .env.example .env
- run: npm run lint
- run: npm run prettier:ci
- run: npm run build --if-present
env:
CI: true
6 changes: 6 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*.png
*.ico
*.prisma
*.sql
*.otf
.next/
2 changes: 1 addition & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ services:
- 3001:80
- 25:25
environment:
- ServerOptions__HostName=smtp4dev
- ServerOptions__HostName=smtp4dev
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"start": "next start",
"buildstyles": "tailwindcss -i ./src/styles/globals.css -o ./src/styles/output.css --watch",
"prepare": "husky install",
"prettier": "prettier --write **/*"
"prettier": "prettier --write .",
"prettier:ci": "prettier --check ."
},
"dependencies": {
"@next-auth/prisma-adapter": "^1.0.5",
Expand All @@ -25,7 +26,7 @@
"leaflet": "^1.9.3",
"multiparty": "4.2.3",
"next": "13.1.6",
"next-auth": "^4.20.1",
"next-auth": "^4.24.5",
"next-connect": "0.13.0",
"nodemailer": "^6.9.1",
"objects-to-csv": "^1.3.6",
Expand Down
5 changes: 3 additions & 2 deletions src/components/censusmap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import {
import CensusTractData from "../data/census-tracts_min.json";
import "leaflet/dist/leaflet.css";
import type { GeoJsonObject, Feature, Geometry } from "geojson";
import { Ref, useEffect, useRef, useState } from "react";
import { Layer, LeafletMouseEvent } from "leaflet";
import type { Ref } from "react";
import { useEffect, useRef, useState } from "react";
import type { Layer, LeafletMouseEvent } from "leaflet";
import EsriLeafletGeoSearch from "react-esri-leaflet/plugins/EsriLeafletGeoSearch";
import { api } from "../utils/api";
import Link from "next/link";
Expand Down
2 changes: 1 addition & 1 deletion src/pages/api/export.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function handleError(error, res) {
}

const handler = nc({
onError: (err, req, res, next) => handleError(err, res),
onError: (err, req, res) => handleError(err, res),
onNoMatch: (req, res) => {
res.status(404).end("Page is not found");
},
Expand Down
2 changes: 1 addition & 1 deletion src/pages/polissurvey.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { NextPage } from "next";
import { useRouter } from "next/router";
import { useEffect, useState } from "react";
import { useEffect } from "react";
import { api } from "../utils/api";
import Link from "next/link";
import ProgressBar from "../components/ProgressBar";
Expand Down

0 comments on commit 3eac92a

Please sign in to comment.