Skip to content
Merged

Luxon #244

Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ Pull requests are welcome. To get started, clone this repository, run `npm i`, a

While developing, run `npx mix watch` to compile assets as you edit them. When you're ready to commit, run `npx mix --production` to minify them for production.

## Credits
## Changelog

This project uses [React JS](https://reactjs.org/) and [Bootstrap CSS](https://getbootstrap.com/).
| Version | Date | Changes |
| ------- | ----------- | ------------------------------------------------------------------------- |
| 1.4 | Sep 4, 2022 | Replaced `moment-timezone` with `luxon`<br/>Restyled in-progress meetings |
2 changes: 1 addition & 1 deletion e2e/tests/meeting-details.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ test.describe('Meeting Details', () => {
: 'https://www.google.com/maps/dir/?api=1&destination=37.15777%2C-121.98421'
);

await expect(time).toHaveText('Thursday 7:30 pm – 8:30 pm');
await expect(time).toHaveText('Thursday 7:30 PM – 8:30 PM');

await expect(await types.allTextContents()).toStrictEqual([
'Birthday',
Expand Down
4 changes: 1 addition & 3 deletions index.d.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
type Translation = import('./src/types/Translation').Translation;
type MeetingType = import('./src/types/MeetingType').MeetingType;
type Timezone = import('./src/types/Timezone').Timezone;

type Lang = 'en' | 'es' | 'fr';

interface TSMLReactConfig {
cache: boolean;
columns: Array<
'time' | 'distance' | 'name' | 'location_group' | 'address' | 'region'
>;
timezone: Timezone;
timezone: string;
conference_providers: Record<string, string>;
defaults: {
distance: string[];
Expand Down
3 changes: 0 additions & 3 deletions jest.setup.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import '@testing-library/jest-dom/extend-expect';
import React from 'react';
import * as momentTZ from 'moment-timezone';

momentTZ.tz.setDefault('America/New_York');

global.React = React;

Expand Down
6 changes: 6 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[build]
publish = "public/"
command = "npx mix --production"

[[plugins]]
package = "@netlify/plugin-lighthouse"
97 changes: 46 additions & 51 deletions package-lock.json

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

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tsml-ui",
"version": "1.3.7",
"version": "1.4",
"private": false,
"license": "MIT",
"scripts": {
Expand All @@ -14,10 +14,11 @@
"devDependencies": {
"@babel/preset-react": "^7.14.5",
"@babel/preset-typescript": "^7.16.7",
"@playwright/test": "^1.19.0",
"@playwright/test": "^1.25.1",
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^12.1.2",
"@types/jest": "^27.4.0",
"@types/luxon": "^3.0.1",
"@types/react": "^17.0.38",
"@types/react-dom": "^17.0.11",
"@types/react-test-renderer": "^17.0.1",
Expand All @@ -34,7 +35,7 @@
"dependencies": {
"bootstrap": "^5.1.3",
"deepmerge": "^4.2.2",
"moment-timezone": "^0.5.37",
"luxon": "^3.0.3",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-infinite-scroller": "^1.2.6",
Expand Down
2 changes: 1 addition & 1 deletion public/app.js

Large diffs are not rendered by default.

14 changes: 0 additions & 14 deletions public/app.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,3 @@ object-assign
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

//! Copyright (c) JS Foundation and other contributors

//! github.com/moment/moment-timezone

//! license : MIT

//! moment-timezone.js

//! moment.js

//! moment.js locale configuration

//! version : 0.5.37
1 change: 0 additions & 1 deletion public/data/aasepia.test.json

This file was deleted.

Loading