Skip to content

Commit

Permalink
Merge pull request #33 from michaelclapham/ionic-router
Browse files Browse the repository at this point in the history
WIP: Use Ionic react router with bottom tabs
  • Loading branch information
michaelclapham authored Mar 29, 2024
2 parents 456153d + 8fecd5b commit 21f3fd6
Show file tree
Hide file tree
Showing 20 changed files with 569 additions and 338 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
## QR Sync Admin Web

This is the new web interface for the QR Sync Admin app.

The goal of this admin app is for controlling multiple computers using a quick and easy QR scanning sync process.
Expand Down
172 changes: 158 additions & 14 deletions package-lock.json

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

8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@
"react-dom": "^18.2.0",
"react-qr-code": "^2.0.12",
"react-responsive-carousel": "^3.2.23",
"typescript": "^4"
"typescript": "^4.9.5",
"@ionic/react-router": "7.8.0",
"react-router": "^5.3.4",
"react-router-dom": "^5.3.4"
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/node": "^20.11.19",
"@types/react": "^18.2.56",
"@types/react-dom": "^18.2.19",
"@types/react-qr-reader": "^2.1.7",
"@types/react-router-dom": "^5.3.3",
"eslint-utils": "^3.0.0",
"react-scripts": "^5.0.1",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11"
Expand All @@ -42,4 +46,4 @@
"last 1 safari version"
]
}
}
}
4 changes: 2 additions & 2 deletions public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#107C76"
}
}
4 changes: 2 additions & 2 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
body {
--ion-color-primary: #107C76;
--ion-color-primary: #107c76;
--ion-background-color: rgb(39, 39, 39);
--ion-text-color: white;
--ion-text-color-rgb: 255, 255, 255;
Expand Down Expand Up @@ -80,4 +80,4 @@ body {
to {
transform: rotate(360deg);
}
}
}
10 changes: 5 additions & 5 deletions src/App.test.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from './App';
import React from "react";
import ReactDOM from "react-dom";
import { App } from "./App";

it('renders without crashing', () => {
const div = document.createElement('div');
it("renders without crashing", () => {
const div = document.createElement("div");
ReactDOM.render(<App />, div);
ReactDOM.unmountComponentAtNode(div);
});
Loading

0 comments on commit 21f3fd6

Please sign in to comment.