Merge pull request #182 from icefoganalytics/main

Updates from Icefog

Author: datajohnson

.dockerignore

@@ -1,3 +1,5 @@
-src/*/node_modules
-src/*/dist
+api/node_modules
+api/dist
+web/node_modules
+web/dist
 npm-debug.log

.eslintrc.yml

@@ -0,0 +1,11 @@
+env:
+  browser: true
+  es2021: true
+  node: true
+extends:
+  - prettier
+overrides: []
+parserOptions:
+  ecmaVersion: latest
+  sourceType: module
+rules: {}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+# Context
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Relates to:
+- TODO
+
+# Context
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/issue_template.md

@@ -1,43 +1,24 @@
-Please replace the following example with your own content.
+Fixes TODO
 
-Fixes [#25](https://github.com/icefoganalytics/yhsi/issues/25)
+Relates to:
 
-# User Story
+- TODO
 
-See https://github.com/icefoganalytics/yhsi/issues/3
-As an edit level user I can edit the /sites Themes & Function form and it will create a site change request for admin approval.
+# Context
 
-# Details
+TODO
 
-Now that I have a working example in the form of the Summary, Location, and Dates & Conditions sections, this task is simply a port of the existing patterns to include an additional sub-form.
+# Implementation
 
-# Implementation Details
-
-- Tweaked PlaceEdit saving and serialization to hopefully reduce developer errors.
-- Dockerize the test suite and update the README.
-- add a `dev ts-node` to get access to a local node repl that runs typescript.
+TODO
 
 # Screenshots
 
-![image](https://user-images.githubusercontent.com/23045206/163441939-d889fb77-1b78-40e6-b59d-c3a386cc3a5d.png)
+TODO
 
 # Testing Instructions
 
-1. Update your user roles to include `Site Admin` via the database console.
-2. Go to the /sites table and select a site.
-3. In the Themes & Function form, make an edit and press save.
-4. The site will refresh and your edits will be saved.
-5. Update your user roles so that they _do not include_ `Site Admin` or `Administrator` via the database console. Something like `Site Viewer` would probably be best.
-6. Go to the /sites table and select a site.
-7. In the summary form, make and edit (or two) and press save.
-8. The page will refresh and all Themes & Function fields will become readonly. The save button on the Themes & Function form will be disabled with an appropriate tooltip.
-9. Make yourself an `Site Admin` again and go to the /sites-change-requests table.
-10. The new change request will be at the top of the list. Click on it to review.
-11. Note the various features:
-
-- "accept/reject" toggle buttons
-- accept/reject all
-- save button is locked until all changes are approved/rejected
-
-12. Reject and accept some changes and press Save.
-13. Go back to the /sites table and check that you can now edit the site and that the changes have been applied or rejected correctly.
+1. Run the test suite via `dev test` (or `dev test_api`)
+2. Boot the app via `dev up`
+3. Log in to the app at http://localhost:8080
+4.

.github/pull_request_template.md

@@ -72,7 +72,8 @@ typings/
 
 # dotenv environment variables file
 .env
-src/api/.env
+.envrc
+api/.env
 .env.development
 .env.test
 .env.production
@@ -114,5 +115,4 @@ db/photo_data.sql
 db/place_data.sql
 
 # Other
-package-lock.json
 .DS_Store

.gitignore

@@ -1,5 +1,6 @@
 # .prettierrc or .prettierrc.yaml
-embeddedLanguageFormatting: "auto"
+$schema: 'https://json.schemastore.org/prettierrc'
+embeddedLanguageFormatting: 'auto'
 jsxSingleQuote: true
 pugAttributeSeparator: 'as-needed'
 pugSingleQuote: false
@@ -8,5 +9,11 @@ semi: true
 singleAttributePerLine: true
 singleQuote: true
 tabWidth: 2
-trailingComma: "es5"
+trailingComma: 'es5'
 useTabs: true
+printWidth: 100
+plugins:
+  - prettier-plugin-embed
+  - prettier-plugin-sql
+language: 'tsql'
+paramTypes: "{ named: [':'] }"

.prettierrc.yaml

@@ -0,0 +1,2 @@
+nodejs 20.18.0
+ruby 3.3.5

.tool-versions

@@ -14,29 +14,29 @@ ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
 RUN mkdir /home/node/app && chown -R node:node /home/node/app
 RUN mkdir /home/node/web && chown -R node:node /home/node/web
 
-COPY --chown=node:node src/web/package*.json /home/node/web/
-COPY --chown=node:node src/api/package*.json /home/node/app/
+COPY --chown=node:node web/package*.json /home/node/web/
+COPY --chown=node:node api/package*.json /home/node/app/
 
 RUN npm install -g npm@8.5.5
 USER node
 
 WORKDIR /home/node/app
 RUN npm install && npm cache clean --force --loglevel=error
-COPY --chown=node:node src/api/.env* ./
+COPY --chown=node:node api/.env* ./
 
 WORKDIR /home/node/web
 
 RUN npm install && npm cache clean --force --loglevel=error
-COPY --chown=node:node src/api /home/node/app/
-COPY --chown=node:node src/web /home/node/web/
+COPY --chown=node:node api /home/node/app/
+COPY --chown=node:node web /home/node/web/
 
 RUN npm run build:docker
 
 EXPOSE 3000
 
 WORKDIR /home/node/app
 
-COPY src/api/templates /home/node/app/dist/templates
+COPY api/templates /home/node/app/dist/templates
 
 ENV NODE_ENV=production
 #RUN npm install --platform=linux --arch=x64 sharp@0.29.1