CWS 5.0.1

ChrisRoss5 · Nov 23, 2021 · 6b18049 · 6b18049
1 parent 799d31f
commit 6b18049
Show file tree

Hide file tree

Showing 43 changed files with 337 additions and 2,150 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 # e-Dnevnik Plus
 
-###### Verzija: 5.0
-
+###### Verzija:
 ## Kako instalirati proširenje?
 
 Preuzmi [/dist](dist) i povuci na `chrome://extensions/` (_developer mode_ omogućen)
@@ -21,3 +20,6 @@ Preuzmi [verziju iz trgovine](https://chrome.google.com/webstore/detail/e-dnevni
   * [/service-worker.ts](extension_scripts/service_worker.ts) zamijenio je "background.js" iz manifesta v2
   * [/content-script.ts](extension_scripts/content-script.ts) je cijeli e-Dnevnik Plus Classic
 * Ostali dokumenti sastav su Vue projekta koji tvore e-Dnevnik Plus App u [/dist/app](dist/app)
+
+
+Više informacija uskoro...
diff --git a/dist.zip b/dist.zip
diff --git a/dist/_metadata/generated_indexed_rulesets/_ruleset1 b/dist/_metadata/generated_indexed_rulesets/_ruleset1
diff --git a/dist/app/css/app.19325743.css b/dist/app/css/app.19325743.css
diff --git a/dist/app/css/app.2fbd3226.css b/dist/app/css/app.2fbd3226.css
diff --git a/dist/app/index.html b/dist/app/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="hr"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><link rel="icon" href="favicon.png"><title>e-Dnevnik Plus</title><link href="css/app.2fbd3226.css" rel="preload" as="style"><link href="css/chunk-vendors.f4472ffa.css" rel="preload" as="style"><link href="js/app.311da5dc.js" rel="preload" as="script"><link href="js/chunk-vendors.75d5fdb7.js" rel="preload" as="script"><link href="css/chunk-vendors.f4472ffa.css" rel="stylesheet"><link href="css/app.2fbd3226.css" rel="stylesheet"></head><body class="theme--default" style="opacity: 0"><noscript style="font-size: 40px; display: grid; place-content: center; min-height: 50vh;"><strong>e-Dnevnik Plus ne radi bez Javascript-a!</strong></noscript><div id="app"></div><script src="js/chunk-vendors.75d5fdb7.js"></script><script src="js/app.311da5dc.js"></script></body></html>
+<!DOCTYPE html><html lang="hr"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><link rel="icon" href="favicon.png"><title>e-Dnevnik Plus</title><link href="css/app.19325743.css" rel="preload" as="style"><link href="css/chunk-vendors.f4472ffa.css" rel="preload" as="style"><link href="js/app.f31ba838.js" rel="preload" as="script"><link href="js/chunk-vendors.75d5fdb7.js" rel="preload" as="script"><link href="css/chunk-vendors.f4472ffa.css" rel="stylesheet"><link href="css/app.19325743.css" rel="stylesheet"></head><body class="theme--default" style="opacity: 0"><noscript style="font-size: 40px; display: grid; place-content: center; min-height: 50vh;"><strong>e-Dnevnik Plus ne radi bez Javascript-a!</strong></noscript><div id="app"></div><script src="js/chunk-vendors.75d5fdb7.js"></script><script src="js/app.f31ba838.js"></script></body></html>
diff --git a/dist/app/js/app.311da5dc.js b/dist/app/js/app.311da5dc.js
diff --git a/dist/app/js/app.311da5dc.js.map b/dist/app/js/app.311da5dc.js.map
diff --git a/dist/app/js/app.f31ba838.js b/dist/app/js/app.f31ba838.js
diff --git a/dist/app/js/app.f31ba838.js.map b/dist/app/js/app.f31ba838.js.map
diff --git a/dist/content-script.js b/dist/content-script.js
@@ -24,7 +24,7 @@ function onLogout(e) {
         return;
     else
         e.preventDefault();
-    chrome.storage.sync.clear(() => {
+    chrome.storage.sync.remove("login", () => {
         logoutCleared = true;
         e.target.click();
     });

diff --git a/dist/service_worker.js b/dist/service_worker.js
@@ -22,8 +22,30 @@ function onInstalled(details) {
             chrome.storage.local.clear();
             chrome.tabs.create({ url: "https://ednevnik.plus/#azuriran" });
         }
+        else if (previousVersion == "5.0")
+            update501();
     }
 }
+function update501() {
+    chrome.storage.local.get(null, (state) => {
+        if (!state || !state.users)
+            return;
+        state.users.forEach((user) => {
+            const subjectsSettings = user.settings.subjectsSettings;
+            const showColors = subjectsSettings.subjectColors;
+            delete subjectsSettings.subjectColors;
+            user.settings.subjectsSettings = {
+                ...subjectsSettings,
+                ...{
+                    subjectLineColors: showColors,
+                    subjectColumnColors: showColors,
+                },
+            };
+        });
+        chrome.storage.local.set(state);
+    });
+    chrome.storage.sync.set({ "newUpdates": true, "updateNotif": true });
+}
 function onMessage(request, sender, sendResponse) {
     if (request == "GET_ACTIVE_RULES") {
         chrome.declarativeNetRequest.getEnabledRulesets(sendResponse);

diff --git a/docs/css/app.c7cf78f1.css b/docs/css/app.c7cf78f1.css
diff --git a/docs/img/browser2.66ce747a.png b/docs/img/browser2.66ce747a.png
diff --git a/docs/index.html b/docs/index.html
@@ -4,4 +4,4 @@
       }
       gtag("js", new Date());
 
-      gtag("config", "G-7NB9L0MRKR");</script><link href="css/app.37a28ea8.css" rel="preload" as="style"><link href="js/app.c20b8454.js" rel="preload" as="script"><link href="js/chunk-vendors.30b75682.js" rel="preload" as="script"><link href="css/app.37a28ea8.css" rel="stylesheet"></head><body><noscript style="font-size: 40px; display: grid; place-content: center; min-height: 50vh;"><strong>e-Dnevnik Plus ne radi bez Javascript-a!</strong></noscript><div id="app"></div><script src="js/chunk-vendors.30b75682.js"></script><script src="js/app.c20b8454.js"></script></body></html>
+      gtag("config", "G-7NB9L0MRKR");</script><link href="css/app.c7cf78f1.css" rel="preload" as="style"><link href="js/app.ef1c5372.js" rel="preload" as="script"><link href="js/chunk-vendors.4d5da0a3.js" rel="preload" as="script"><link href="css/app.c7cf78f1.css" rel="stylesheet"></head><body><noscript style="font-size: 40px; display: grid; place-content: center; min-height: 50vh;"><strong>e-Dnevnik Plus ne radi bez Javascript-a!</strong></noscript><div id="app"></div><script src="js/chunk-vendors.4d5da0a3.js"></script><script src="js/app.ef1c5372.js"></script></body></html>
diff --git a/docs/js/app.ef1c5372.js b/docs/js/app.ef1c5372.js
diff --git a/docs/js/app.ef1c5372.js.map b/docs/js/app.ef1c5372.js.map
diff --git a/docs/js/chunk-vendors.4d5da0a3.js b/docs/js/chunk-vendors.4d5da0a3.js
diff --git a/docs/js/chunk-vendors.4d5da0a3.js.map b/docs/js/chunk-vendors.4d5da0a3.js.map
diff --git a/ednevnik.plus/src/App.vue b/ednevnik.plus/src/App.vue
@@ -7,13 +7,12 @@
     >
   </div>
   <div id="background">
-    <img
-      src="@/assets/img/favicon.png"
+    <div
       v-for="(rect, i) in rectangles"
       :key="i"
       class="rect"
       :style="rect"
-    />
+    ></div>
   </div>
   <div id="heading">
     <router-link to="/" id="title">
@@ -27,7 +26,7 @@
     <div style="color: gray">
       Ovo proširenje nije službena CARNET-ova aplikacija.
     </div>
-    2019.-2021. |
+    2019.-{{ new Date().getFullYear() }}. |
     <a
       class="plus"
       href="mailto:[email protected]?subject=e-Dnevnik Plus — Kontakt"
@@ -42,13 +41,14 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from "vue";
+import { CSSProperties, defineComponent } from "vue";
 
 export default defineComponent({
   name: "App",
   data() {
     return {
-      rectangles: [] as Record<string, string>[],
+      rectangles: [] as CSSProperties[],
+      speed: 20000,
     };
   },
   mounted() {
@@ -57,30 +57,30 @@ export default defineComponent({
       localStorage.removeItem("path");
       this.$router.replace(path);
     }
-
-    for (let i = 0; i < 20; i++)
-      setTimeout(() => this.updateRect(i), this.rand(0, 15000));
+    for (let i = 0; i < 10; i++) this.updateRect(i, true);
   },
   methods: {
-    updateRect(i: number) {
-      const transition = this.rand(10000, 20000);
+    updateRect(i: number, init?: boolean) {
       const size = this.rand(30, 150);
-      this.rectangles[i] = { bottom: size * -2 + "px", opacity: "1" };
-
+      const bottomPerc = this.rand(0, 100);
+      const bottom = init ? bottomPerc + "%" : -size + "px";
+      const transition =
+        this.rand(this.speed, this.speed * 2) *
+        (init ? 1 - bottomPerc / 100 : 1);
+      this.rectangles[i] = { bottom, opacity: "1" };
       setTimeout(() => {
         this.rectangles[i] = {
           bottom: "100%",
           opacity: "0",
-          left: this.rand(0, 100) + "%",
+          left: this.rand(-10, 100) + "%",
           width: size + "px",
           height: size + "px",
           borderRadius: this.rand(size / 10, size / 3) + "px",
-          transform: "translateX(-50%)",
-          transition: `bottom ${transition}ms, opacity ${transition * 0.2}ms ${
-            transition * 0.5
-          }ms`,
+          animation: "rotate " + size * 100 + "ms linear infinite",
+          transition: `bottom ${transition}ms ease-out, opacity ${
+            transition * 0.2
+          }ms ${transition * 0.5}ms`,
         };
-
         setTimeout(() => this.updateRect(i), transition);
       }, 100);
     },
@@ -115,12 +115,29 @@ export default defineComponent({
   right: 0;
   bottom: 0;
   z-index: -1;
+  opacity: 0;
+  transform: scale(0) rotate(45deg);
+  animation: show-background 3s forwards;
 
   .rect {
-    /* background: rgba($plus-color, 0.5); */
+    background: rgba($plus-color, 0.5);
     opacity: 0;
     filter: opacity(0.4);
     position: absolute;
+    will-change: bottom, opacity;
+  }
+}
+
+@keyframes show-background {
+  to {
+    opacity: 1;
+    transform: none;
+  }
+}
+
+@keyframes rotate {
+  to {
+    transform: rotate(360deg);
   }
 }
 

diff --git a/ednevnik.plus/src/styles/global.scss b/ednevnik.plus/src/styles/global.scss
@@ -21,6 +21,8 @@ body {
   margin: 0;
   padding: 0;
   -webkit-tap-highlight-color: transparent;
+  /* background: linear-gradient(110deg, #e3f1ff, #0000, #dfefff); */
+  background: radial-gradient(circle at 0% 260%, #c5f7db 40%, #0000 70%), linear-gradient(110deg, #cae0ee, #0000, #f5def0);
   touch-action: manipulation;
 }
 

diff --git a/ednevnik.plus/src/views/Changelog.vue b/ednevnik.plus/src/views/Changelog.vue
@@ -1,46 +1,85 @@
 <template>
   <div class="card content-card">
-    <h2>Povijest ažuriranja</h2>
-    <hr />
-    <h3>Verzija 5.0 (za učenike i roditelje)</h3>
-    <ul>
-      <li>Uklonjene sve funkcionalnosti prethodne verzije proširenja.</li>
-      <li>
-        Novi prozor proširenja omogućuje odabir verzije e-Dnevnika:
-        <span class="plus">App</span> ili <span class="plus">Classic</span
-        ><br />
-        Odabrana verzija postaje zadana te se svaki put otvara navigacijom na
-        <a href="ocjene.skole.hr" class="plus">ocjene.skole.hr</a>
-        <img class="card" src="~@/assets/img/popup.png" />
-      </li>
-      <li>
-        <span class="plus">App</span> verzija je nova aplikacija za napredan
-        pregled sadržaja s e-Dnevnika:
+    <h2>
+      Povijest ažuriranja
+      <div id="app-types" class="card">
+        <div :class="{ 'selected-app': !selectedApp }" @click="selectedApp = 0">
+          za učenike i roditelje
+        </div>
+        <div :class="{ 'selected-app': selectedApp }" @click="selectedApp = 1">
+          za nastavnike
+        </div>
+      </div>
+    </h2>
+    <template v-if="!selectedApp">
+      <h3>Verzija 5.0.1<span>(22.11.2021.)</span></h3>
+      <ul>
+        <li>e-Dnevnik Plus <span class="plus">App</span>:</li>
         <ul>
           <li>
-            Osnovne lokacije su: Razred, Kalendar, Statistika ocjena i
-            Kalkulator bodova.
+            Ispravljena greška: zbroj novih ocjena i bilješki uvijek je bio 3.
           </li>
           <li>
-            Sve promjene ostaju automatski spremljene za prijavljenog korisnika.
+            Opcija "Prikaži boje ocjena" podjeljena je na dvije nove opcije:
+            <ul>
+              <li>Prikaži boje ocjena po ukupnom broju</li>
+              <li>Prikaži boje ocjena po mjesecima</li>
+            </ul>
           </li>
+          <li>Smanjen zum cijele aplikacije za 10%.</li>
+          <li>Dodana opcija prikaza lozinke kod prijave.</li>
         </ul>
-      </li>
-      <li>
-        <span class="plus">Classic</span> verzija dodaje prosjeke na stranici
-        e-Dnevnika:
+        <li>e-Dnevnik Plus <span class="plus">Classic</span>:</li>
         <ul>
           <li>
-            Na stranici odabira predmeta, za svaki predmet i završni prosjek.
+            Dodana opcija automatske prijave (kvačica na /login stranici).
           </li>
-          <li>Na stranici predmeta.</li>
         </ul>
-      </li>
-    </ul>
-    <h3>Verzija &lt;= 4.8:</h3>
-    <a class="plus" href="https://chrisross5.github.io/e-Dnevnik-Plus-WEB-stari/"
-      >https://chrisross5.github.io/e-Dnevnik-Plus-WEB-stari/</a
-    >
+      </ul>
+      <h3>Verzija 5.0<span>(11.11.2021.)</span></h3>
+      <ul>
+        <li>Uklonjene sve funkcionalnosti prethodne verzije proširenja.</li>
+        <li>
+          Novi prozor proširenja omogućuje odabir verzije e-Dnevnika:
+          <span class="plus">App</span> ili <span class="plus">Classic</span
+          ><br />
+          Odabrana verzija postaje zadana te se svaki put otvara navigacijom na
+          <a href="ocjene.skole.hr" class="plus">ocjene.skole.hr</a>
+          <img class="card" src="~@/assets/img/popup.png" />
+        </li>
+        <li>
+          <span class="plus">App</span> verzija je nova aplikacija za napredan
+          pregled sadržaja s e-Dnevnika:
+          <ul>
+            <li>
+              Osnovne lokacije su: Razred, Kalendar, Statistika ocjena i
+              Kalkulator bodova.
+            </li>
+            <li>
+              Sve promjene ostaju automatski spremljene za prijavljenog
+              korisnika.
+            </li>
+          </ul>
+        </li>
+        <li>
+          <span class="plus">Classic</span> verzija dodaje prosjeke na stranici
+          e-Dnevnika:
+          <ul>
+            <li>
+              Na stranici odabira predmeta, za svaki predmet i završni prosjek.
+            </li>
+            <li>Na stranici predmeta.</li>
+          </ul>
+        </li>
+      </ul>
+      <h3>Verzija &lt;= 4.8<span>(21.3.2019.)</span></h3>
+      <a
+        class="plus"
+        href="https://chrisross5.github.io/e-Dnevnik-Plus-WEB-stari/"
+        >https://chrisross5.github.io/e-Dnevnik-Plus-WEB-stari/</a
+      >
+    </template>
+    <template v-else>Nema novosti.</template>
   </div>
 </template>
 
@@ -49,10 +88,42 @@ import { defineComponent } from "vue";
 
 export default defineComponent({
   name: "Changelog",
+  data() {
+    return {
+      selectedApp: 0 as 0 | 1,
+    };
+  },
 });
 </script>
 
 <style lang="scss" scoped>
+h2 {
+  display: flex;
+  border-bottom: 1px solid #ccc;
+  padding-bottom: 20px;
+}
+
+#app-types {
+  display: flex;
+  align-items: center;
+  font-size: 1rem;
+  font-weight: normal;
+  margin-left: auto;
+
+  div {
+    padding: 5px 15px;
+    cursor: pointer;
+
+    &:last-child {
+      border-left: 1px solid #ccc;
+    }
+  }
+}
+
+.selected-app {
+  font-weight: bold;
+}
+
 .card > ul > li {
   padding: 7px 0;
 }
@@ -61,6 +132,12 @@ h3:not(:first-of-type) {
   padding-top: 20px;
 }
 
+h3 span {
+  color: #ccc;
+  font-weight: normal;
+  padding-left: 15px;
+}
+
 img {
   display: block;
   margin: 20px auto;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang="hr"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><link rel="icon" href="favicon.png"><title>e-Dnevnik Plus</title><link href="css/app.2fbd3226.css" rel="preload" as="style"><link href="css/chunk-vendors.f4472ffa.css" rel="preload" as="style"><link href="js/app.311da5dc.js" rel="preload" as="script"><link href="js/chunk-vendors.75d5fdb7.js" rel="preload" as="script"><link href="css/chunk-vendors.f4472ffa.css" rel="stylesheet"><link href="css/app.2fbd3226.css" rel="stylesheet"></head><body class="theme--default" style="opacity: 0"><noscript style="font-size: 40px; display: grid; place-content: center; min-height: 50vh;"><strong>e-Dnevnik Plus ne radi bez Javascript-a!</strong></noscript><div id="app"></div><script src="js/chunk-vendors.75d5fdb7.js"></script><script src="js/app.311da5dc.js"></script></body></html>
		<!DOCTYPE html><html lang="hr"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><link rel="icon" href="favicon.png"><title>e-Dnevnik Plus</title><link href="css/app.19325743.css" rel="preload" as="style"><link href="css/chunk-vendors.f4472ffa.css" rel="preload" as="style"><link href="js/app.f31ba838.js" rel="preload" as="script"><link href="js/chunk-vendors.75d5fdb7.js" rel="preload" as="script"><link href="css/chunk-vendors.f4472ffa.css" rel="stylesheet"><link href="css/app.19325743.css" rel="stylesheet"></head><body class="theme--default" style="opacity: 0"><noscript style="font-size: 40px; display: grid; place-content: center; min-height: 50vh;"><strong>e-Dnevnik Plus ne radi bez Javascript-a!</strong></noscript><div id="app"></div><script src="js/chunk-vendors.75d5fdb7.js"></script><script src="js/app.f31ba838.js"></script></body></html>