Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Next-release #240

Merged
merged 39 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b366f06
Add sticky footer code
meagan13 Dec 18, 2023
04f65d9
Add migration file for three new categories
meagan13 Dec 18, 2023
02ad703
Finish adding services categories
meagan13 Dec 19, 2023
df581a4
Fix share button z index
meagan13 Dec 19, 2023
7ee12b7
add testing double check
gerzarko Dec 19, 2023
845036a
update messages regarding sign up links and not registered email
r-southworth Jan 17, 2024
0191850
combine garden and cleaning into home and office, update migration fi…
r-southworth Jan 17, 2024
266f973
check that src exists before rendering
r-southworth Jan 22, 2024
dcc3686
Merge branch 'main' into testingDoubleCheck
gerzarko Jan 22, 2024
3cc78e0
Update ci.yaml
r-southworth Jan 22, 2024
d4eade5
try changing version of supbase cli in CI action
r-southworth Jan 22, 2024
955d48b
actually change version of supbase cli
r-southworth Jan 22, 2024
dbd17f3
try another version of supabase CLI
r-southworth Jan 22, 2024
bc6649f
another version of supabase cli
r-southworth Jan 22, 2024
ffe088e
Merge pull request #227 from gerzarko/testingDoubleCheck
r-southworth Jan 22, 2024
d82f08e
Merge branch 'next-release' into addServiceCategories
r-southworth Jan 22, 2024
e77ca42
minor grammer updates
r-southworth Jan 22, 2024
d014e9b
npm install
r-southworth Jan 22, 2024
50f5282
Merge pull request #230 from datagrove/grammerUpdates
r-southworth Jan 22, 2024
7fe50c2
switch to overflow x auto
r-southworth Jan 22, 2024
b9081aa
npm install
r-southworth Jan 22, 2024
f2a68c1
move overflow/scroll bars to outside div
r-southworth Jan 22, 2024
7092b14
try tailwind scrollbar
r-southworth Jan 22, 2024
132eb76
add shadow/glow
r-southworth Jan 22, 2024
c8ecb5e
remove virtual
r-southworth Jan 22, 2024
e7dd3c7
fix seed.sql
r-southworth Jan 23, 2024
5b94010
Merge pull request #231 from datagrove/next-release
r-southworth Jan 23, 2024
8d1fd1c
edit all records to language spoken spanish, then require language sp…
r-southworth Jan 23, 2024
9231929
Merge pull request #232 from datagrove/addServiceCategories
r-southworth Jan 23, 2024
99cfc0c
Merge pull request #233 from datagrove/ProviderLanguagesSpoken
r-southworth Jan 23, 2024
03c5191
Update ci.yaml
r-southworth Jan 23, 2024
feab965
Merge pull request #234 from datagrove/next-release
r-southworth Jan 23, 2024
1a95677
move name center and fix footer in middle of page on short pages (mob…
r-southworth Jan 23, 2024
6b95fae
Merge pull request #235 from datagrove/stickyFooter
r-southworth Jan 23, 2024
521b254
fix sign up tool tips and client edit tool tips, fix import component…
r-southworth Jan 23, 2024
24be940
Merge pull request #236 from datagrove/toolTipBugs
r-southworth Jan 23, 2024
8a6dc1d
Add FAQ pages in each language, add link to FAQ to profile button, fi…
r-southworth Jan 29, 2024
4f0fd37
Merge pull request #238 from datagrove/faqsPage
r-southworth Jan 29, 2024
dfe2b5c
slight tweaks/bug fixes from testing
r-southworth Feb 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

- uses: supabase/setup-cli@v1
with:
version: latest
version: 1.106.1

- name: Start Supabase local development setup
run: supabase start
Expand All @@ -25,4 +25,4 @@ jobs:
echo "Detected uncommitted changes after build. See status below:"
git diff
exit 1
fi
fi
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,8 @@ pnpm-debug.log*
.DS_Store

# Pages created by i18n-astro-aut integration
astro_tmp_pages_*
astro_tmp_pages_*
/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
86 changes: 80 additions & 6 deletions package-lock.json

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

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,19 @@
},
"devDependencies": {
"@iconify-json/tabler": "^1.1.87",
"@playwright/test": "^1.40.1",
"@tailwindcss/typography": "^0.5.10",
"@types/intl-tel-input": "^18.1.1",
"@types/jquery": "^3.5.16",
"@types/node": "^20.10.5",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.7",
"@vite-pwa/astro": "^0.1.3",
"prettier": "^3.0.1",
"prettier-plugin-astro": "^0.11.0",
"prettier-plugin-tailwindcss": "^0.5.3",
"supabase": "^1.110.1",
"tailwind-scrollbar": "^3.0.5",
"vite-plugin-pwa": "^0.16.5",
"workbox-cli": "^7.0.0",
"workbox-routing": "^7.0.0",
Expand Down
77 changes: 77 additions & 0 deletions playwright.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import { defineConfig, devices } from '@playwright/test';

/**
* Read environment variables from file.
* https://github.com/motdotla/dotenv
*/
// require('dotenv').config();

/**
* See https://playwright.dev/docs/test-configuration.
*/
export default defineConfig({
testDir: './test',
/* Run tests in files in parallel */
fullyParallel: true,
/* Fail the build on CI if you accidentally left test.only in the source code. */
forbidOnly: !!process.env.CI,
/* Retry on CI only */
retries: process.env.CI ? 2 : 0,
/* Opt out of parallel tests on CI. */
workers: process.env.CI ? 1 : undefined,
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
reporter: 'html',
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
use: {
/* Base URL to use in actions like `await page.goto('/')`. */
// baseURL: 'http://127.0.0.1:3000',

/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
trace: 'on-first-retry',
},

/* Configure projects for major browsers */
projects: [
{
name: 'chromium',
use: { ...devices['Desktop Chrome'] },
},

{
name: 'firefox',
use: { ...devices['Desktop Firefox'] },
},

{
name: 'webkit',
use: { ...devices['Desktop Safari'] },
},

/* Test against mobile viewports. */
// {
// name: 'Mobile Chrome',
// use: { ...devices['Pixel 5'] },
// },
// {
// name: 'Mobile Safari',
// use: { ...devices['iPhone 12'] },
// },

/* Test against branded browsers. */
// {
// name: 'Microsoft Edge',
// use: { ...devices['Desktop Edge'], channel: 'msedge' },
// },
// {
// name: 'Google Chrome',
// use: { ...devices['Desktop Chrome'], channel: 'chrome' },
// },
],

/* Run your local dev server before starting the tests */
// webServer: {
// command: 'npm run start',
// url: 'http://127.0.0.1:3000',
// reuseExistingServer: !process.env.CI,
// },
});
4 changes: 2 additions & 2 deletions src/assets/categoryIcons/circled-left-arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/categoryIcons/education.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/categoryIcons/home.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/assets/categoryIcons/plate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/categoryIcons/virtual.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading