Merge branches (#18)

* Fixed API error for starting containers

* New dev branch

* update

* Updated icon package

* Added X-API-Key support

* Fix token load on restart

* Improved readme (#13)

* Update README.md

* Fixed X-API-Key (really)

* Update to please github

Improved README.md

Readme Co-authored-by: Klemen Skerbiš <[email protected]>

.metadata

@@ -15,7 +15,10 @@ migration:
     - platform: root
       create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268
       base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268
-    - platform: ios
+    - platform: linux
+      create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268
+      base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268
+    - platform: windows
       create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268
       base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268
 

Dockerfile

@@ -1,8 +1,8 @@
 # Build
-FROM ubuntu:22.04
+FROM ubuntu:22.04 AS base
 
 RUN apt update 
-RUN apt install -y curl git wget unzip
+RUN apt install -y curl git wget unzip python3
 RUN apt clean
 
 RUN git clone https://github.com/flutter/flutter.git /usr/local/flutter
@@ -16,8 +16,9 @@ COPY . /portarius/
 WORKDIR /portarius/
 RUN flutter build web
 
+EXPOSE 80
+
 # Runtime
 FROM nginx:alpine
 LABEL org.opencontainers.image.source="https://github.com/zbejas/portarius"
-COPY nginx.conf /etc/nginx/conf.d/default.conf
-COPY --from=0 /portarius/build/web/ /usr/share/nginx/html/
+COPY --from=base /portarius/build/web /usr/share/nginx/html

LICENSE

@@ -1,14 +1,3 @@
-Copyright (C) 2022 Anže Mavrič
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -628,3 +617,14 @@ reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
+
+Copyright (C) 2022 Anže Mavrič
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

README.md

@@ -2,9 +2,15 @@
 
 *[Latin: Porta/Door Arius/Keeper]*
 
+<p align="center">
+  <img width="1000" src="https://i.imgur.com/jrnn0kO.png">
+</p>
+
 [![GitHub issues](https://img.shields.io/github/issues/zbejas/portarius?color=red)](https://github.com/zbejas/portarius/issues)
-[![Release date](https://img.shields.io/github/release-date/zbejas/portarius?labely)](https://github.com/zbejas/portarius/releases/)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/zbejas/portarius?label=Release)](https://github.com/zbejas/portarius/releases/latest)
+[![Release date](https://img.shields.io/github/release-date/zbejas/portarius?labely)](https://github.com/zbejas/portarius/releases/)
+![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/zbejas/portarius?color=yellow&include_prereleases&label=dev-release)
+[![GitHub](https://img.shields.io/github/license/zbejas/portarius)](https://github.com/zbejas/portarius/blob/master/LICENSE)
 
 ## Features
 
@@ -14,40 +20,62 @@
 - Biometric authentication
 - Data is stored with AES256 encryption
 
-<details>
-  <summary>Expand features list</summary>
-  More features coming soon!
-</details>
-
 ## Screenshots
 
-| Drawer | Home | Auth |
-| :--: | :--: | :--: |
-| ![Screenshot of functions](https://i.imgur.com/1cmRnmb.jpeg) | ![Screenshot of OBD data](https://i.imgur.com/yAKqI9S.jpeg) | ![Screenshot of Dashboard](https://i.imgur.com/N6MqvTx.jpeg) |
+| Drawer | Home | Auth | Settings |
+| :--: | :--: | :--: | :--: |
+| <img src="https://i.imgur.com/L8CG6hG.jpeg" width="200"> | <img src="https://i.imgur.com/jbblbfZ.jpeg" width="200"> | <img src="https://i.imgur.com/ETl1vpC.jpeg" width="200"> | <img src="https://i.imgur.com/oNxU12R.jpeg" width="200"> |
 
 <details>
-  <summary>More Screenshots</summary>
-
-| Settings | Drawer Light | Home Light | Auth Light | Settings Light |
-| :--: | :--: | :--: | :--: | :--: |
-| ![Screenshot of functions](https://i.imgur.com/IRjzCYd.jpeg) | ![Screenshot of Dashboard](https://i.imgur.com/L8CG6hG.jpeg) | ![Screenshot of functions](https://i.imgur.com/jbblbfZ.jpeg) | ![Screenshot of functions](https://i.imgur.com/ETl1vpC.jpeg) | ![Screenshot of functions](https://i.imgur.com/oNxU12R.jpeg) |
+  <summary>Dark mode screenshots</summary>
+  
+| Drawer | Home | Auth | Settings |
+| :--: | :--: | :--: | :--: |
+| <img src="https://i.imgur.com/IRjzCYd.jpeg" width="200"> | <img src="https://i.imgur.com/1cmRnmb.jpeg" width="200"> | <img src="https://i.imgur.com/yAKqI9S.jpeg" width="200"> | <img src="https://i.imgur.com/N6MqvTx.jpeg" width="200"> |
 
 </details>
 
 ## Install
 
-- Download the [latest version](https://github.com/zbejas/portarius/releases).
-- Click on it and install it.
+[<img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" alt="Get it on Google Play" height="80">](https://play.google.com/store/apps/details?id=si.zbe.portarius)
+[<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="80">](https://github.com/zbejas/portarius/releases)
+[<img src="https://censorship.no/img/github-badge.png" alt="Get it on Github" height="80">](https://github.com/zbejas/portarius/releases)
 
 ## Contribute
 
-- Test the app and Improve this project by requesting features or reporting bugs in [Issues](https://github.com/zbejas/portarius/issues) section and make a PR upon Issue discussion.
+- [Report](https://github.com/zbejas/portarius/issues/new?assignees=&labels=&template=bug_report.md&title=) a bug
+- [Request](https://github.com/zbejas/portarius/issues/new?assignees=&labels=&template=feature_request.md&title=) a feature
+- [Help](https://github.com/zbejas/portarius/issues) with the issues
+- [Send](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests) a pull request
 
 ## Documentation
 
-- FAQ
-- Manual
-
-## Notes
-
-- WebApp was pushed due to interest, but does not work at the moment cause of XMLHttpRequest error.
+- [FAQ](https://github.com/zbejas/portarius/wiki/FAQ) 
+- [Privacy policy](https://github.com/zbejas/portarius/wiki/Privacy-Policy)
+
+## Donations
+
+<table>
+  <tr>
+    <th colspan="3">Thank you for donating</th>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://www.paypal.com/paypalme/zbe420"><img src="https://raw.githubusercontent.com/aha999/DonateButtons/master/Paypal.png" height="80"/></a></td>
+    <td align="center">PayPal</td>
+    <td><a href="https://paypal.me/zbe420/">paypal.me/zbe420</a></td>
+  </tr>
+  <tr>
+    <td align="center">
+      <a href="https://liberapay.com/zbejas/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="55"></a>
+    </td>
+    <td align="center">Liberapay</td>
+    <td>
+      <a href="https://liberapay.com/zbejas/donate/">liberapay.com/zbejas</a>
+    </td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://www.buymeacoffee.com/zbejas"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="https://www.buymeacoffee.com/zbejas" height="55"></a></td>
+    <td align="center">Buy me a coffee</a></td>
+    <td><a href="https://www.buymeacoffee.com/zbejas">buymeacoffee.com/zbejas</a></td>
+  </tr>
+</table>

ios/Runner.xcodeproj/project.pbxproj

@@ -478,4 +478,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
+}

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1,122 @@
 {
-  "images" : [
+  "images": [
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "filename": "Icon-App-20x20@2x.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "20x20"
     },
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
+      "filename": "Icon-App-20x20@3x.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "20x20"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "1x"
+      "filename": "Icon-App-29x29@1x.png",
+      "idiom": "iphone",
+      "scale": "1x",
+      "size": "29x29"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "filename": "Icon-App-29x29@2x.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "29x29"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
+      "filename": "Icon-App-29x29@3x.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "29x29"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "filename": "Icon-App-40x40@2x.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "40x40"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
+      "filename": "Icon-App-40x40@3x.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "40x40"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "filename": "Icon-App-60x60@2x.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "60x60"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
+      "filename": "Icon-App-60x60@3x.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "60x60"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
+      "filename": "Icon-App-20x20@1x.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "20x20"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "filename": "Icon-App-20x20@2x.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "20x20"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
+      "filename": "Icon-App-29x29@1x.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "29x29"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "filename": "Icon-App-29x29@2x.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "29x29"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
+      "filename": "Icon-App-40x40@1x.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "40x40"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "filename": "Icon-App-40x40@2x.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "40x40"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
+      "filename": "Icon-App-76x76@1x.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "76x76"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "filename": "Icon-App-76x76@2x.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "76x76"
     },
     {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "filename": "Icon-App-83.5x83.5@2x.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "83.5x83.5"
     },
     {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "[email protected]",
-      "scale" : "1x"
+      "filename": "Icon-App-1024x1024@1x.png",
+      "idiom": "ios-marketing",
+      "scale": "1x",
+      "size": "1024x1024"
     }
   ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
+  "info": {
+    "author": "icons_launcher",
+    "version": 1
   }
-}
+}