Skip to content

Commit

Permalink
add version numbering
Browse files Browse the repository at this point in the history
  • Loading branch information
sandervonk committed Jul 25, 2022
1 parent bea09d6 commit 6e37aba
Show file tree
Hide file tree
Showing 13 changed files with 156 additions and 368 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ jobs:
uses: actions/checkout@v2
with:
ref: ${{ github.ref }}
- name: Add Version Numbers
uses: jacobtomlinson/gha-find-replace@v2
with:
find: "[-version-number-]"
replace: "${{github.ref_name}}"
regex: false
- name: Minify
uses: anthonyftwang/[email protected]
- name: Commit to deployment
Expand Down
17 changes: 4 additions & 13 deletions About/archive & templates/newindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,15 @@
<meta name="description" content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!" />
<!-- Schema.org for Google -->
<meta itemprop="name" content="VITE! French Practice" />
<meta
itemprop="description"
content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!"
/>
<meta itemprop="description" content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!" />
<!-- Twitter -->
<meta name="twitter:card" content="summary" />
<meta name="twitter:title" content="About VITE! French Practice Tools" />
<meta
name="twitter:description"
content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!"
/>
<meta name="twitter:description" content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!" />
<meta name="twitter:image:src" content="https://sander.vonk.one/VITE/img/social-img/social-twitter.png" />
<!-- Open Graph general (Facebook, Pinterest & Google+) -->
<meta name="og:title" content="VITE! French Practice" />
<meta
name="og:description"
content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!"
/>
<meta name="og:description" content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!" />
<meta name="og:image" content="https://sander.vonk.one/VITE/img/social-img/social-og.png" />
<meta name="og:url" content="https://sander.vonk.one/VITE/desktop/" />
<meta name="og:site_name" content="About VITE! French Practice Tools" />
Expand Down Expand Up @@ -70,5 +61,5 @@
</style>
</head>
<body></body>
<script src="index.js"></script>
<script src="index.js?version=[-version-number-]"></script>
</html>
33 changes: 12 additions & 21 deletions app/conjugator.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<meta name="runsetup" content="true" />
<meta name="noauthenforce" content="true" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="/VITE/css/theme.css" />
<link rel="stylesheet" href="/VITE/css/theme-dark.css" media="(prefers-color-scheme: unset) and not(print)" id="theme-dark-stylesheet" />
<link rel="stylesheet" href="/VITE/css/common.css" />
<link async rel="stylesheet" href="/VITE/css/fonts.css" />
<link rel="stylesheet" href="/VITE/css/conjugator.css" />
<link rel="stylesheet" href="/VITE/css/theme.css?version=[-version-number-]" />
<link rel="stylesheet" href="/VITE/css/theme-dark.css?version=[-version-number-]" media="(prefers-color-scheme: unset) and not(print)" id="theme-dark-stylesheet" />
<link rel="stylesheet" href="/VITE/css/common.css?version=[-version-number-]" />
<link async rel="stylesheet" href="/VITE/css/fonts.css?version=[-version-number-]" />
<link rel="stylesheet" href="/VITE/css/conjugator.css?version=[-version-number-]" />
<meta name="theme-color" id="theme-light-color" content="#FFFFFF" />
<meta name="apple-mobile-web-app-status-bar" id="theme-light-color" content="#FFFFFF" />
<meta name="apple-mobile-web-app-status-bar" id="theme-dark-color" media="prefers-color-scheme: unset" content="#131F22" />
Expand Down Expand Up @@ -44,24 +44,15 @@
<meta name="description" content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!" />
<!-- Schema.org for Google -->
<meta itemprop="name" content="VITE! | Conjugator" />
<meta
itemprop="description"
content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!"
/>
<meta itemprop="description" content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!" />
<!-- Twitter -->
<meta name="twitter:card" content="summary" />
<meta name="twitter:title" content="VITE! | Conjugator" />
<meta
name="twitter:description"
content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!"
/>
<meta name="twitter:description" content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!" />
<meta name="twitter:image:src" content="/VITE/img/social-img/social-twitter.png" />
<!-- Open Graph general (Facebook, Pinterest & Google+) -->
<meta name="og:title" content="VITE! | Conjugator" />
<meta
name="og:description"
content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!"
/>
<meta name="og:description" content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!" />
<meta name="og:image" content="/VITE/img/social-img/social-og.png" />
<meta name="og:url" content="/VITE/app/conjugator.html" />
<meta name="og:site_name" content="VITE! French Conjugation" />
Expand Down Expand Up @@ -160,8 +151,8 @@
</div>
</div>
</body>
<script src="/VITE/js/util.js"></script>
<script src="/VITE/js/conjugator.js"></script>
<script src="/VITE/js/mobile-vite.js"></script>
<script src="/VITE/js/firestore-page-auth.js"></script>
<script src="/VITE/js/util.js?version=[-version-number-]"></script>
<script src="/VITE/js/conjugator.js?version=[-version-number-]"></script>
<script src="/VITE/js/mobile-vite.js?version=[-version-number-]"></script>
<script src="/VITE/js/firestore-page-auth.js?version=[-version-number-]"></script>
</html>
75 changes: 21 additions & 54 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<meta name="runsettings" content="true" />
<meta name="guestprompt" content="true" />
<meta name="waitforload" content="true" />
<link rel="stylesheet" href="/VITE/css/common.css" />
<link async rel="stylesheet" href="/VITE/css/fonts.css" />
<link rel="stylesheet" href="/VITE/css/common.css?version=[-version-number-]" />
<link async rel="stylesheet" href="/VITE/css/fonts.css?version=[-version-number-]" />
<link rel="manifest" href="/VITE/manifest.json" />
<!-- ios support -->
<meta name="mobile-web-app-capable" content="yes" />
Expand All @@ -34,24 +34,15 @@
<meta name="description" content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!" />
<!-- Schema.org for Google -->
<meta itemprop="name" content="VITE! Mobile" />
<meta
itemprop="description"
content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!"
/>
<meta itemprop="description" content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!" />
<!-- Twitter -->
<meta name="twitter:card" content="summary" />
<meta name="twitter:title" content="VITE! Mobile" />
<meta
name="twitter:description"
content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!"
/>
<meta name="twitter:description" content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!" />
<meta name="twitter:image:src" content="/VITE/img/social-img/social-twitter.png" />
<!-- Open Graph general (Facebook, Pinterest & Google+) -->
<meta name="og:title" content="VITE! French Practice" />
<meta
name="og:description"
content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!"
/>
<meta name="og:description" content="Conjugate French verbs, learn new tenses, or practice existing ones, all 100% free with VITE! French tools!" />
<meta name="og:image" content="/VITE/img/social-img/social-og.png" />
<meta name="og:url" content="sander.vonk.one/VITE/" />
<meta name="og:site_name" content="VITE! French Conjugation Practice" />
Expand All @@ -68,10 +59,10 @@

gtag("config", "G-5GF8MRX85G");
</script>
<link rel="stylesheet" href="/VITE/css/theme.css" />
<link rel="stylesheet" href="/VITE/css/theme-dark.css" media="(prefers-color-scheme: unset) and not(print)" id="theme-dark-stylesheet" />
<link rel="stylesheet" href="/VITE/css/app.css" />
<link rel="stylesheet" href="/VITE/css/streak.css" />
<link rel="stylesheet" href="/VITE/css/theme.css?version=[-version-number-]" />
<link rel="stylesheet" href="/VITE/css/theme-dark.css?version=[-version-number-]" media="(prefers-color-scheme: unset) and not(print)" id="theme-dark-stylesheet" />
<link rel="stylesheet" href="/VITE/css/app.css?version=[-version-number-]" />
<link rel="stylesheet" href="/VITE/css/streak.css?version=[-version-number-]" />
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://www.gstatic.com/firebasejs/8.10.0/firebase-app.js"></script>
<script src="https://www.gstatic.com/firebasejs/8.10.0/firebase-auth.js"></script>
Expand Down Expand Up @@ -145,9 +136,7 @@
<div class="settings-section" id="theme-section">
<div class="section-title">Theme</div>
<div class="section-content box">
<div class="section-description">
Chose your color theme. By default this will match your device’s system-wide settings if supported
</div>
<div class="section-description">Chose your color theme. By default this will match your device’s system-wide settings if supported</div>

<div class="switch-toggle box">
<input type="radio" name="theme" id="theme-dark" class="hidden-radio" value="dark" />
Expand All @@ -160,9 +149,7 @@
<div class="settings-section" id="pacing-section" placeholdaction>
<div class="section-title">Pacing</div>
<div class="section-content box">
<div class="section-description">
Should VITE! try to adapt to your progress? If this setting is disabled, you will manually have to enable new tenses and verbs.
</div>
<div class="section-description">Should VITE! try to adapt to your progress? If this setting is disabled, you will manually have to enable new tenses and verbs.</div>

<div class="switch-toggle box">
<input type="radio" name="pacing" id="pacing-yes" class="hidden-radio" value="yes" checked />
Expand All @@ -175,9 +162,7 @@
<div class="settings-section" id="saves-section" placeholdaction>
<div class="section-title">Cloud Saves</div>
<div class="section-content box">
<div class="section-description">
Should we save your progress to the cloud? Note that this only works when logged in with a Google Account through OAuth 2.
</div>
<div class="section-description">Should we save your progress to the cloud? Note that this only works when logged in with a Google Account through OAuth 2.</div>

<div class="switch-toggle box">
<input type="radio" name="saves" id="saves-yes" class="hidden-radio" value="yes" checked />
Expand All @@ -191,26 +176,10 @@
<div class="settings-section" id="prior-section">
<div class="section-title">Leveling and Groups</div>
<div class="section-content box">
<div class="section-description">
Re-open the starting prior knowledge panel to chose a new starting level. Create or join a class to keep track of your progress
</div>
<div class="section-description">Re-open the starting prior knowledge panel to chose a new starting level. Create or join a class to keep track of your progress</div>
<div class="flex-row">
<button
class="box-button blue-button"
id="retake-prior-button"
style="flex-grow: 1"
onclick="window.location.href = '../onboarding.html?showTutorial=false' "
>
Open
</button>
<button
class="box-button green-button"
id="class-dashboard-button"
style="margin-left: 10px; flex-grow: 1; color: white"
onclick="window.location.href = '../class/' "
>
Join
</button>
<button class="box-button blue-button" id="retake-prior-button" style="flex-grow: 1" onclick="window.location.href = '../onboarding.html?showTutorial=false' ">Open</button>
<button class="box-button green-button" id="class-dashboard-button" style="margin-left: 10px; flex-grow: 1; color: white" onclick="window.location.href = '../class/' ">Join</button>
</div>
</div>
</div>
Expand Down Expand Up @@ -272,9 +241,7 @@
<div id="tutorial-box">
<div id="tutorial-text">
<div id="tutorial-title">The Learn Tab</div>
<div id="tutorial-description">
This tab is your go-to place for everything learning. It'll provide you access to different activities at the touch of a tile!
</div>
<div id="tutorial-description">This tab is your go-to place for everything learning. It'll provide you access to different activities at the touch of a tile!</div>
</div>

<div id="tutorial-arrow-container">
Expand Down Expand Up @@ -303,9 +270,9 @@
</div>
</footer>
</body>
<script src="/VITE/js/util.js"></script>
<script src="/VITE/js/streak.js"></script>
<script src="/VITE/js/app.js"></script>
<script src="/VITE/js/firestore-page-auth.js"></script>
<script src="/VITE/PWA.js"></script>
<script src="/VITE/js/util.js?version=[-version-number-]"></script>
<script src="/VITE/js/streak.js?version=[-version-number-]"></script>
<script src="/VITE/js/app.js?version=[-version-number-]"></script>
<script src="/VITE/js/firestore-page-auth.js?version=[-version-number-]"></script>
<script src="/VITE/PWA.js?version=[-version-number-]"></script>
</html>
Loading

0 comments on commit 6e37aba

Please sign in to comment.