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 #231

Merged
merged 22 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
4350e49
Small changes to delete filters
Maycol-Espinoza-Ponce Nov 20, 2023
2b85bd3
Merge pull request #215 from datagrove/ProviderLanguagesSpoken
meagan13 Nov 20, 2023
5b2f22a
Merge pull request #214 from Maycol-Espinoza-Ponce/next-release
r-southworth Nov 20, 2023
15df3c3
update spanish language files
r-southworth Nov 20, 2023
7780096
update whatsapp in all languages
r-southworth Nov 20, 2023
b4731e8
add descriptions for french file
r-southworth Nov 20, 2023
21f936e
Merge pull request #219 from datagrove/ProviderLanguagesSpoken
r-southworth Nov 20, 2023
f70eadf
Merge pull request #218 from datagrove/improve-internationalization
meagan13 Nov 21, 2023
65e3193
Fix devUrl link
meagan13 Nov 22, 2023
158d472
Merge pull request #220 from datagrove/next-release
meagan13 Nov 22, 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
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
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
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: supabase/setup-cli@v1
- uses: supabase/setup-cli@v1.123.4
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/
73 changes: 67 additions & 6 deletions package-lock.json

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

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@
},
"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",
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,
// },
});
2 changes: 1 addition & 1 deletion src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const CONFIG = {
title: 'TodoServis',
description: 'Everything you need to get the job done.',
url: 'https://todoservis.com/',
devUrl: 'http://localhost:3000',
devUrl: 'http://localhost:4321',
pagesDevUrl: 'https://pwa.marketplace-4xm.pages.dev',

defaultTheme: 'system', // Values: "system" | "light" | "dark" | "light:only" | "dark:only"
Expand Down
35 changes: 18 additions & 17 deletions src/i18n/UI/English.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,24 @@ export const English = {

pageDescriptions: {
services: "Find the services you need to get the job done. Search for keywords, filter by category, and filter by location to find what you need. View post previews and click on a post to learn more.",
signUp: "Provider your email and create a password to signup to search services or post services on Todo Servis.",
login: "Enter your email and password to login to Todo Servis.",
home: 'Todo Servis, home to everything you need to get the job done.',
signUp: "Provider your email and create a password to signup to search services or post services on TodoServis.",
login: "Enter your email and password to login to TodoServis.",
home: 'TodoServis, home to everything you need to get the job done.',
// signIn: string,
createClientAccount: "Join Todo Servis as a client and unlock a world of services. Sign up today to find and connect with top service providers in your area.",
viewClientAccount: "Access and manage your client account information effortlessly on Todo Servis.",
createPost: 'Create a post including title, category, description, location, and images to offer your service on Todo Servis.',
createProviderAccount: 'Create a Provider Account to start posting your services on Todo Servis.',
viewProviderAccount: 'Manage your provider account details and review your posts on Todo Servis.',
createClientAccount: "Join TodoServis as a client and unlock a world of services. Sign up today to find and connect with top service providers in your area.",
viewClientAccount: "Access and manage your client account information effortlessly on TodoServis.",
createPost: 'Create a post including title, category, description, location, and images to offer your service on TodoServis.',
createProviderAccount: 'Create a Provider Account to start posting your services on TodoServis.',
viewProviderAccount: 'Manage your provider account details and review your posts on TodoServis.',
clientViewProviderAccount: "Discover more about this provider. Explore their profile and available services.",
page404: '404 - page not found',
requestPasswordReset: "Forgot your password? Request a secure password reset for your Todo Servis account. Enter your email and follow the instructions to regain access.",
resetPassword: "Reset your password securely with Todo Servis. Follow the link from your email to choose a new password.",
requestPasswordReset: "Forgot your password? Request a secure password reset for your TodoServis account. Enter your email and follow the instructions to regain access.",
resetPassword: "Reset your password securely with TodoServis. Follow the link from your email to choose a new password.",
terms: "Review our Terms and Conditions. Please note, the translations are provided as a courtesy, the official binding terms are in Spanish.",
privacy: "Review our privacy policy. Please note, the translations are provided as a courtesy, the official binding policy is in Spanish.",
acceptableUse: "Review our acceptable use policy. Please note, the translations are provided as a courtesy, the official binding policy is in Spanish.",
about: "Discover the story behind Todo Servis – who we are, our mission, and our passion for helping revolutionize the way individuals and businesses find and provide services. Learn about our team and the values that drive us. Join us on our journey!",
impact: "Explore the meaningful impact of Todo Servis. Discover how we're making a difference and learn more about our projects, and contributions to positive change.",
about: "Discover the story behind TodoServis – who we are, our mission, and our passion for helping revolutionize the way individuals and businesses find and provide services. Learn about our team and the values that drive us. Join us on our journey!",
impact: "Explore the meaningful impact of TodoServis. Discover how we're making a difference and learn more about our projects, and contributions to positive change.",
fullPost: "Read more about this service and contact the provider if interested. Explore additional images and the full description of the service.",
},

Expand Down Expand Up @@ -91,8 +91,8 @@ export const English = {
error404: 'Something went wrong',
onlyProvider: "Only providers can create posts.",
signInAsProvider: "Please sign in to a provider account before posting.",
checkEmail: "Check your email for the reset link!",
checkConfirmEmail: 'If this email is not already registered, you will receive an email confirmation link.',
checkEmail: "Check your email for the reset link! If you did not receive the email, please check your spam folder. Links are valid for 24 hours.",
checkConfirmEmail: 'If this email is not already registered, you will receive an email confirmation link. Please check your spam folder if you did not receive the email. Links are valid for 24 hours.',
signIn: "Please sign in to access this page.",
createProviderAccount: "Please sign in to create a provider profile.",
createClientAccount: "Please sign in to create a client profile.",
Expand Down Expand Up @@ -203,6 +203,7 @@ export const English = {
clientCreateProfileError: "Error creating client profile",
clientEditProfileError: "Error updating client profile",
createUserError: "Error creating user, please try again or contact us for assistance.",
emailNotConfirmed: "Email not registered. If you previously registered this email address please use the forgot password option below, otherwise please use the sign up option below.",
},

socialModal: {
Expand All @@ -220,8 +221,8 @@ export const English = {
},

ariaLabels: {
todo: 'Todo Servis Logo Return to Homepage',
logo: 'Todo Servis Logo',
todo: 'TodoServis Logo Return to Homepage',
logo: 'TodoServis Logo',
navigation: 'Navigation',
checkboxMajorMunicipality: "Checkbox for selecting major municipality",
checkboxMinorMunicipality: "Checkbox for selecting minor municipality",
Expand Down Expand Up @@ -300,7 +301,7 @@ export const English = {
{ ariaLabel: 'Facebook', icon: 'tabler:brand-facebook', href: 'https://www.facebook.com/TodoServisCostaRica' },
// { ariaLabel: 'RSS', icon: 'tabler:rss', href: '/rss.xml' },
{ ariaLabel: 'Github', icon: 'tabler:brand-github', href: 'https://github.com/datagrove/marketplace' },
{ ariaLabel: 'Whatsapp', icon: 'tabler:brand-whatsapp', href: 'https://wa.me/message/RUD233VVIVPMG1'},
{ ariaLabel: 'WhatsApp', icon: 'tabler:brand-whatsapp', href: 'https://wa.me/message/RUD233VVIVPMG1'},
{ ariaLabel: 'Discord', icon: 'tabler:brand-discord', href: 'https://discord.gg/NpV44vS6bF'},
],
footNote: `
Expand Down
Loading
Loading