diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2977e0d..708c0ef 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -15,10 +15,10 @@ "server": "db", "driver": "MySQL", "port": 3306, - "database": "writer", - "username": "writer", + "database": "photos", + "username": "photos", "askForPassword": false, - "password": "writer", + "password": "photos", "connectionTimeout": 15 }, { @@ -26,10 +26,10 @@ "server": "dbtest", "driver": "MySQL", "port": 3306, - "database": "writer_test", - "username": "writer", + "database": "photos_test", + "username": "photos", "askForPassword": false, - "password": "writer", + "password": "photos", "connectionTimeout": 15 } ] @@ -42,7 +42,10 @@ "ms-vscode.vscode-typescript-tslint-plugin" ], // Use 'forwardPorts' to make a list of ports inside the container available locally. - "forwardPorts": [1234, 3000], + "forwardPorts": [ + 1234, + 3000 + ], // Use 'postCreateCommand' to run commands after the container is created. "postCreateCommand": "npm config set unsafe-perm=true && npm i && cd frontend && npm i", // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root. diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 552566c..4e45026 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -33,10 +33,10 @@ services: volumes: - mariadb-data:/var/lib/mysql environment: - MYSQL_DATABASE: writer - MYSQL_USER: writer - MYSQL_PASSWORD: writer - MYSQL_ROOT_PASSWORD: writer + MYSQL_DATABASE: photos + MYSQL_USER: photos + MYSQL_PASSWORD: photos + MYSQL_ROOT_PASSWORD: photos dbtest: image: mariadb:latest @@ -44,10 +44,10 @@ services: volumes: - mariadbtest-data:/var/lib/mysql environment: - MYSQL_DATABASE: writer_test - MYSQL_USER: writer - MYSQL_PASSWORD: writer - MYSQL_ROOT_PASSWORD: writer + MYSQL_DATABASE: photos_test + MYSQL_USER: photos + MYSQL_PASSWORD: photos + MYSQL_ROOT_PASSWORD: photos # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward MongoDB locally. # (Adding the "ports" property to this file will not forward from a Codespace.) diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 69c50a9..9ba13ff 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -4,7 +4,7 @@ import { AuthScreen } from "~Auth/AuthScreen"; import { requireAuth } from "~Auth/AuthWrapper"; import { Home } from "~Home/Home"; -export function AppComponent(props: RouteComponentProps) { +export const AppComponent: React.FunctionComponent = () => { return ( , @@ -12,6 +12,6 @@ export function AppComponent(props: RouteComponentProps) { , ); -} +}; export const App = withRouter(AppComponent); diff --git a/frontend/src/AppToaster.tsx b/frontend/src/AppToaster.tsx index 88253fe..a040ec0 100644 --- a/frontend/src/AppToaster.tsx +++ b/frontend/src/AppToaster.tsx @@ -5,7 +5,7 @@ export const AppToaster = Toaster.create({ position: Position.TOP, }); -export function showPasswordSavedToast() { +export function showPasswordSavedToast(): void { AppToaster.show({ message: "Password saved!", intent: "success", @@ -13,7 +13,7 @@ export function showPasswordSavedToast() { }); } -export function showPasswordNotSavedToast(error: string) { +export function showPasswordNotSavedToast(error: string): void { AppToaster.show({ message: "Password not saved! " + error, intent: "danger", diff --git a/frontend/src/Home/Home.tsx b/frontend/src/Home/Home.tsx index 2e172d7..fa69398 100644 --- a/frontend/src/Home/Home.tsx +++ b/frontend/src/Home/Home.tsx @@ -52,7 +52,7 @@ export class HomeComponent extends React.PureComponent { minimal={true} onClick={() => this.props.history.push("/")} > - Writer + Photos diff --git a/frontend/src/Landing/Landing.tsx b/frontend/src/Landing/Landing.tsx index 6713dbb..d2c3bd0 100644 --- a/frontend/src/Landing/Landing.tsx +++ b/frontend/src/Landing/Landing.tsx @@ -10,7 +10,7 @@ export function LandingComponent(props: RouteComponentProps) { <> - Writer + Photos diff --git a/frontend/src/index.html b/frontend/src/index.html index 17807f6..f8bee9b 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -1,20 +1,21 @@ - - - - - + + + + - Writer - + - -
- - - + Photos + + + +
+ + + + \ No newline at end of file diff --git a/frontend/src/tests/utils.ts b/frontend/src/tests/utils.ts index b549515..392f931 100644 --- a/frontend/src/tests/utils.ts +++ b/frontend/src/tests/utils.ts @@ -1,3 +1,3 @@ -export function flushPromises() { +export function flushPromises(): Promise { return new Promise(setImmediate); } diff --git a/package.json b/package.json index d54cb6e..258461d 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "lint-frontend-fix": "cd frontend && npm run lint-fix", "lint-all": "npm run lint && npm run lint-frontend", "lint-all-fix": "npm run lint-fix && npm run lint-frontend-fix", - "prettier-check": "prettier src/** --check && prettier frontend/src/** --check", - "prettify": "prettier src/** --write && prettier frontend/src/** --write" + "prettier-check": "prettier src/**/*.ts frontend/src/**/*.ts frontend/src/**/*.tsx --check", + "prettify": "prettier src/**/*.ts frontend/src/**/*.ts frontend/src/**/*.tsx --write" }, "license": "MIT", "dependencies": {