From 9df939a73fca559081523477cdcc9805c225fa23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20L=2E=20=C5=A0ijanec?= Date: Tue, 12 May 2020 21:13:59 +0200 Subject: DO NOT MERGE --- TESTING! --- .gitignore | 3 - README.md | 30 ++++++++++ compose-html | Bin 0 -> 22544 bytes global.bvr | 1 + js/lang/bundle.js | 10 +++- pages-src/about.bvr | 116 +++++++++++++++++++++++++++++++++++++ pages-src/absences.bvr | 72 +++++++++++++++++++++++ pages-src/changelog.bvr | 127 +++++++++++++++++++++++++++++++++++++++++ pages-src/chats.bvr | 91 +++++++++++++++++++++++++++++ pages-src/grades.bvr | 98 +++++++++++++++++++++++++++++++ pages-src/gradings.bvr | 110 +++++++++++++++++++++++++++++++++++ pages-src/jitsi.bvr | 52 +++++++++++++++++ pages-src/meals.bvr | 115 +++++++++++++++++++++++++++++++++++++ pages-src/messaging.bvr | 130 ++++++++++++++++++++++++++++++++++++++++++ pages-src/misc/navigation.bvr | 18 ++++++ pages-src/privacypolicy.bvr | 55 ++++++++++++++++++ pages-src/settings.bvr | 103 +++++++++++++++++++++++++++++++++ pages-src/teachers.bvr | 81 ++++++++++++++++++++++++++ pages-src/timetable.bvr | 85 +++++++++++++++++++++++++++ pages-src/tos.bvr | 69 ++++++++++++++++++++++ pages/about.html | 38 +++++++----- pages/absences.html | 38 +++++++----- pages/changelog.html | 4 ++ pages/chats.html | 41 +++++++------ pages/grades.html | 38 +++++++----- pages/gradings.html | 38 +++++++----- pages/jitsi.html | 74 ++++++++++++++++++++++++ pages/meals.html | 38 +++++++----- pages/messaging.html | 39 ++++++++----- pages/privacypolicy.html | 4 ++ pages/settings.html | 38 +++++++----- pages/teachers.html | 38 +++++++----- pages/timetable.html | 38 +++++++----- pages/tos.html | 4 ++ 34 files changed, 1679 insertions(+), 157 deletions(-) delete mode 100644 .gitignore create mode 100644 README.md create mode 100755 compose-html create mode 100644 global.bvr create mode 100644 pages-src/about.bvr create mode 100644 pages-src/absences.bvr create mode 100644 pages-src/changelog.bvr create mode 100644 pages-src/chats.bvr create mode 100644 pages-src/grades.bvr create mode 100644 pages-src/gradings.bvr create mode 100644 pages-src/jitsi.bvr create mode 100644 pages-src/meals.bvr create mode 100644 pages-src/messaging.bvr create mode 100644 pages-src/misc/navigation.bvr create mode 100644 pages-src/privacypolicy.bvr create mode 100644 pages-src/settings.bvr create mode 100644 pages-src/teachers.bvr create mode 100644 pages-src/timetable.bvr create mode 100644 pages-src/tos.bvr create mode 100644 pages/jitsi.html diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d7e7a5d..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.save -*.save.* -*.swp diff --git a/README.md b/README.md new file mode 100644 index 0000000..8317853 --- /dev/null +++ b/README.md @@ -0,0 +1,30 @@ +# for developers (rstular) + +from sijanec + +I was frustrated by the fact that I needed to change side navigation on 10+ individual html files if I added a page or wanted +to change a single icon. So I wrote this small script that includes html files from other html files. Syntax `<@?i +navigation@>` in a .bvr file in [pages-src](pages-src) will include [`navigation.bvr` from +`pages-src/misc/`](pages-src/misc/navigation.bvr). PATH (where to search for files to include) can be set in +[`global.bvr`](global.bvr) (separated with a space). Variables can also be set without touching the disk (faster, idrk) with +`<@?s variable_name variable value@>` and read with `<@?s variable_name@>`. To execute a command and surpress output, use +`<@#?x arg@>` where `x` is the command. + +So now pages are now in pages-src and before deployment, `./compose_html pages-src/ pages/` has to be run to update the pages +dir. + +idkr, it seemed like a good idea, but feel free not to use it (write about it here so I won't override your commits). + +the compiled binary works on "`Linux kondenzator 5.3.0-46-generic #38~18.04.1-Ubuntu SMP Tue Mar 31 04:17:56 UTC 2020 x86_64 +x86_64 x86_64 GNU/Linux`". + +this is close to how I compiled it: +``` +idrk=`pwd` +cd /tmp +git clone https://github.com/sijanec/bverbose +cd bverbose +gcc test/compose-all-in-dir.c -I lib -I src +mv a.out $idrk/compose_html +cd $idrk +``` diff --git a/compose-html b/compose-html new file mode 100755 index 0000000..4c1fe5a Binary files /dev/null and b/compose-html differ diff --git a/global.bvr b/global.bvr new file mode 100644 index 0000000..3cfc241 --- /dev/null +++ b/global.bvr @@ -0,0 +1 @@ +<@?s bvr_include_path pages-src/ pages-src/misc/@> diff --git a/js/lang/bundle.js b/js/lang/bundle.js index 58757ed..2dd0511 100644 --- a/js/lang/bundle.js +++ b/js/lang/bundle.js @@ -282,7 +282,9 @@ var langstrings = { // gsec gsecErrNet: "GimSIS connection error", gsecErrLogin: "GimSIS login error (bad password?), try logging out", - gsecErrOther: "GimSIS unknown error, try logging out" + gsecErrOther: "GimSIS unknown error, try logging out", + // videoconferences + videoconferences: "GimB meet" }, sl: { miscTranslationLanguage: "slovenščina", @@ -459,6 +461,8 @@ var langstrings = { // gsec gsecErrNet: "napaka povezave na GimSIS", gsecErrLogin: "napaka avtentikacije na GimSISu (napačno geslo?), poskusite se odjaviti", - gsecErrOther: "neznana napaka GimSISa, poskusite se odjaviti" + gsecErrOther: "neznana napaka GimSISa, poskusite se odjaviti", + // videoconferences + videoconferences: "GimB konference" } -} \ No newline at end of file +} diff --git a/pages-src/about.bvr b/pages-src/about.bvr new file mode 100644 index 0000000..d349799 --- /dev/null +++ b/pages-src/about.bvr @@ -0,0 +1,116 @@ +<@?i global@> + + + + + + + + About « BežiApp + + + + + + + + + + + + + + + + + + + + + + + + + + + + <@?i navigation@> +
+
+
+

BežiApp +

+
version 1.0.12-beta
+
+
+
+
+ +
+
+
+
+
    +
  • +
    translatorsForThisLanguage - miscTranslationLanguage
    +
    • +
  • + miscTranslationAuthors +
    • +
+
+
+
+
+
+ whatIsNew + theToS + thePrivacyPolicy + + reportABug / sendASuggestion (instagram>: @beziapp) + +
+
+
+
+ + + diff --git a/pages-src/absences.bvr b/pages-src/absences.bvr new file mode 100644 index 0000000..60ee008 --- /dev/null +++ b/pages-src/absences.bvr @@ -0,0 +1,72 @@ +<@?i global@> + + + + + + + + Absences « BežiApp + + + + + + + + + + + + + + + + + + + + + + + + + + + <@?i navigation@> +
+
+
+
+ + +
+
+ + +
+
+
+
+
    +
+
+
+
+ + + + diff --git a/pages-src/changelog.bvr b/pages-src/changelog.bvr new file mode 100644 index 0000000..11ab78f --- /dev/null +++ b/pages-src/changelog.bvr @@ -0,0 +1,127 @@ +<@?i global@> + + + + + + + + Changelog « BežiApp + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+

changelog

+
    +
  • +
    Version 1.0.12-beta
    +
    +
      +
    • 1.0.12.28-beta: Now update does not clear whole database => you stay logged in
      • +
    • Added multilanguage support
      • +
    +
    + +
    Version 1.0.11-beta
    +
    +
      +
    • Added end-to-end encrypton support to messaging
      • +
    +
    + +
    Version 1.0.10-beta
    +
    +
      +
    • Added meals
      • +
    +
    + +
    Version 1.0.9-beta
    +
    +
      +
    • Added image sending support to messaging
      • +
    +
    + +
    Version 1.0.8-beta
    +
    +
      +
    • Added messaging
      • +
    +
    + +
    Version 1.0.7-beta
    +
    +
      +
    • Enter key now triggers login in the login form
      • +
    +
    + +
    Version 1.0.6-beta
    +
    +
      +
    • Fixed a typo (related to #5)
      • +
    +
    + +
    Version 1.0.5-beta
    +
    +
      +
    • Fixed default view on startup
      • +
    • Changed promise handling in gradings (#5)
      • +
    +
    + +
    Version 1.0.4-beta
    +
    +
      +
    • Introduced the changelog
      • +
    • Fixed date picker color
      • +
    • Changed weekly timetable accent color
      • +
    • Option for including/excluding temporary grades in average + calculation (credit: Tinkara)
      • +
    +
    +
    • +
+
+
+ + + + diff --git a/pages-src/chats.bvr b/pages-src/chats.bvr new file mode 100644 index 0000000..39e72b1 --- /dev/null +++ b/pages-src/chats.bvr @@ -0,0 +1,91 @@ +<@?i global@> + + + + + + + + Chats « BežiApp + + + + + + + + + + + + + + + + + + + + + + + + <@?i navigation@> + +
+
mustSelectRecipient
+
+
+ +
+
+
+
+
+ mode_edit + + +
+
+ +
+
+
+
+ + diff --git a/pages-src/grades.bvr b/pages-src/grades.bvr new file mode 100644 index 0000000..7615e65 --- /dev/null +++ b/pages-src/grades.bvr @@ -0,0 +1,98 @@ +<@?i global@> + + + + + + + + Grades « BežiApp + + + + + + + + + + + + + + + + + + + + + + + + + + + <@?i navigation@> + + + + +
+
+

+ +

+ +
+ + + + diff --git a/pages-src/gradings.bvr b/pages-src/gradings.bvr new file mode 100644 index 0000000..3239e68 --- /dev/null +++ b/pages-src/gradings.bvr @@ -0,0 +1,110 @@ +<@?i global@> + + + + + + + + Gradings « BežiApp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <@?i navigation@> + + + +
+
+
+
+ + + + diff --git a/pages-src/jitsi.bvr b/pages-src/jitsi.bvr new file mode 100644 index 0000000..797a339 --- /dev/null +++ b/pages-src/jitsi.bvr @@ -0,0 +1,52 @@ +<@?i global@> + + + + + + + + About « BežiApp + + + + + + + + + + + + + + + + + + + + <@?i navigation@> +
+ +
+ + diff --git a/pages-src/meals.bvr b/pages-src/meals.bvr new file mode 100644 index 0000000..a92a6d7 --- /dev/null +++ b/pages-src/meals.bvr @@ -0,0 +1,115 @@ +<@?i global@> + + + + + + + + Meals « BežiApp + + + + + + + + + + + + + + + + + + + + + + + + + + + <@?i navigation@> +
+ + + + + diff --git a/pages-src/messaging.bvr b/pages-src/messaging.bvr new file mode 100644 index 0000000..ed52e8f --- /dev/null +++ b/pages-src/messaging.bvr @@ -0,0 +1,130 @@ +<@?i global@> + + + + + + + + Messaging « BežiApp + + + + + + + + + + + + + + + + + + + + + + + + + + + + <@?i navigation@> +
+

sendAMessage

+
+
+
+
+ account_circle + + +
+
+ subject + + +
+
+ +
+
+
+
+ mode_edit + + +
+
+ +
+
+ +
+
+ +
+
+
+

messages

+ + + +
+

+

+
+ messageStorageUsed: +
+
+ 0/120 messages 10% +
+
+
+
+
+
+

+ maxMessagesNote +

+
+

+
+ + diff --git a/pages-src/misc/navigation.bvr b/pages-src/misc/navigation.bvr new file mode 100644 index 0000000..4bae848 --- /dev/null +++ b/pages-src/misc/navigation.bvr @@ -0,0 +1,18 @@ + + diff --git a/pages-src/privacypolicy.bvr b/pages-src/privacypolicy.bvr new file mode 100644 index 0000000..fc52475 --- /dev/null +++ b/pages-src/privacypolicy.bvr @@ -0,0 +1,55 @@ +<@?i global@> + + + + + + + + Privacy policy « BežiApp + + + + + + + + + + + + + + + + + + + + + + + + + +
+

thePrivacyPolicy

+

privacyImportant

+

privacyOnlyAskedWhen

+

privacyDataCollection

+

privacySharingData

+

privacyExternalSites

+

privacyRefuse

+

privacyAcceptWithUse

+
+

privacyEffectiveAsOf 29 January 2020.

+
+ + diff --git a/pages-src/settings.bvr b/pages-src/settings.bvr new file mode 100644 index 0000000..130def1 --- /dev/null +++ b/pages-src/settings.bvr @@ -0,0 +1,103 @@ +<@?i global@> + + + + + + + + Settings « BežiApp + + + + + + + + + + + + + + + + + + + + + + + + + + + <@?i navigation@> + +
+
+
+

BežiApp +

+
settings
+
+
+
+
+
    +
  • +
    language
    +
    • +
  • + Slovenščina +
    • +
  • + English +
    • + +
+
+
+
+ + + diff --git a/pages-src/teachers.bvr b/pages-src/teachers.bvr new file mode 100644 index 0000000..37ff3e2 --- /dev/null +++ b/pages-src/teachers.bvr @@ -0,0 +1,81 @@ +<@?i global@> + + + + + + + + Teachers « BežiApp + + + + + + + + + + + + + + + + + + + + + + + + + + + <@?i navigation@> + + +
+
+ + + + + + + + +
nameschoolSubject
+
+ + + + diff --git a/pages-src/timetable.bvr b/pages-src/timetable.bvr new file mode 100644 index 0000000..0d8363c --- /dev/null +++ b/pages-src/timetable.bvr @@ -0,0 +1,85 @@ +<@?i global@> + + + + + + + + Timetable « BežiApp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <@?i navigation@> + + + +
+
+
+
+ + + + diff --git a/pages-src/tos.bvr b/pages-src/tos.bvr new file mode 100644 index 0000000..b96eccc --- /dev/null +++ b/pages-src/tos.bvr @@ -0,0 +1,69 @@ +<@?i global@> + + + + + + + + Terms and Conditions « BežiApp + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

theToS

+

termsOfUse

+

termsOfUseDescription:

+
    +
  1. termsOfUseHarass;
    2. +
  2. termsOfUsePost;
    3. +
  3. termsOfUseCommunicate;
    4. +
  4. termsOfUsePurpose;
    5. +
  5. termsOfUseExploit;
    6. +
  6. termsOfUseSpam
    7. +
+

termsOfUseModify

+

terminationOfServices

+

terminationOfServicesDescriptions:

+ +

limitationOfLiability

+

limitationOfLiabilityContent

+
+

tosAreEffectiveAsOf 29 January, 2020.

+
+ + diff --git a/pages/about.html b/pages/about.html index 1da0e03..c4a7c84 100644 --- a/pages/about.html +++ b/pages/about.html @@ -1,3 +1,7 @@ + + + + @@ -43,21 +47,25 @@ - + + +
diff --git a/pages/absences.html b/pages/absences.html index d0acee6..a53709f 100644 --- a/pages/absences.html +++ b/pages/absences.html @@ -1,3 +1,7 @@ + + + + @@ -45,22 +49,26 @@
+ + + -
diff --git a/pages/changelog.html b/pages/changelog.html index 4b34997..9a67316 100644 --- a/pages/changelog.html +++ b/pages/changelog.html @@ -1,3 +1,7 @@ + + + + diff --git a/pages/chats.html b/pages/chats.html index fc35048..d6e9bc3 100644 --- a/pages/chats.html +++ b/pages/chats.html @@ -1,3 +1,7 @@ + + + + @@ -43,21 +47,26 @@
- + + + +
- \ No newline at end of file + diff --git a/pages/grades.html b/pages/grades.html index 0c7e161..abddcb0 100644 --- a/pages/grades.html +++ b/pages/grades.html @@ -1,3 +1,7 @@ + + + + @@ -45,22 +49,26 @@
+ + + -