diff --git a/build/build-cordova.js b/build/build-cordova.js index 32d9ea3..f66bf85 100644 --- a/build/build-cordova.js +++ b/build/build-cordova.js @@ -17,6 +17,7 @@ const build = async () => { format: 'iife', name: 'MyApp', sourcemap: false, + inlineDynamicImports :true }); // Remove old chunk files diff --git a/cordova/package-lock.json b/cordova/package-lock.json index c1e685f..8cd2287 100644 --- a/cordova/package-lock.json +++ b/cordova/package-lock.json @@ -1,20 +1,18 @@ { "name": "edu.midwestern.alvinn", - "version": "0.3.0", + "version": "0.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "edu.midwestern.alvinn", - "version": "0.3.0", + "version": "0.4.0", "license": "Apache-2.0", "devDependencies": { "cordova-android": "^12.0.1", "cordova-browser": "^7.0.0", "cordova-ios": "^7.0.1", - "cordova-plugin-camera": "^7.0.0", - "cordova-plugin-keyboard": "^1.2.0", - "cordova-plugin-statusbar": "^4.0.0" + "cordova-plugin-camera": "^7.0.0" } }, "node_modules/@netflix/nerror": { @@ -542,39 +540,6 @@ } } }, - "node_modules/cordova-plugin-keyboard": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/cordova-plugin-keyboard/-/cordova-plugin-keyboard-1.2.0.tgz", - "integrity": "sha512-Zng4SgDQQ2BCqeDOvrsgNlM9tcjnxmJoh0Qhex0KltMsoR0g/ONbMTpaVvI8EhNKVO8HJPnhFxxzHxrCPLQ7sQ==", - "dev": true, - "engines": [ - { - "name": "cordova", - "version": ">=3.2.0" - } - ] - }, - "node_modules/cordova-plugin-statusbar": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-4.0.0.tgz", - "integrity": "sha512-NTVdQhj9msydnarCH8ijOhASx+6fO16hg17AilAjfzWRvcBoF+4kKkPhTkZM7D2bOBePhfHEaMhEnxnA3M4Dlg==", - "dev": true, - "engines": { - "cordovaDependencies": { - "0.1.0": { - "cordova": ">=3.0.0" - }, - "4.0.0": { - "cordova": ">=3.0.0", - "cordova-android": ">=10.0.0", - "cordova-ios": ">=6.0.0" - }, - "5.0.0": { - "cordova": ">100" - } - } - } - }, "node_modules/cordova-serve": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.1.tgz", @@ -2652,18 +2617,6 @@ "integrity": "sha512-OVQWZTBb18Y6e5c+bbXt3E4Z1yGnYqaywh2h5vVr/+nxMcdMIE+lm527bRK5vLN/RUqhGYP/Z+5n+O7Fk7fVNw==", "dev": true }, - "cordova-plugin-keyboard": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/cordova-plugin-keyboard/-/cordova-plugin-keyboard-1.2.0.tgz", - "integrity": "sha512-Zng4SgDQQ2BCqeDOvrsgNlM9tcjnxmJoh0Qhex0KltMsoR0g/ONbMTpaVvI8EhNKVO8HJPnhFxxzHxrCPLQ7sQ==", - "dev": true - }, - "cordova-plugin-statusbar": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-4.0.0.tgz", - "integrity": "sha512-NTVdQhj9msydnarCH8ijOhASx+6fO16hg17AilAjfzWRvcBoF+4kKkPhTkZM7D2bOBePhfHEaMhEnxnA3M4Dlg==", - "dev": true - }, "cordova-serve": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.1.tgz", diff --git a/cordova/package.json b/cordova/package.json index 3bd1fd3..fff45b1 100644 --- a/cordova/package.json +++ b/cordova/package.json @@ -16,14 +16,10 @@ "cordova-android": "^12.0.1", "cordova-browser": "^7.0.0", "cordova-ios": "^7.0.1", - "cordova-plugin-camera": "^7.0.0", - "cordova-plugin-keyboard": "^1.2.0", - "cordova-plugin-statusbar": "^4.0.0" + "cordova-plugin-camera": "^7.0.0" }, "cordova": { "plugins": { - "cordova-plugin-statusbar": {}, - "cordova-plugin-keyboard": {}, "cordova-plugin-camera": { "ANDROIDX_CORE_VERSION": "1.6.+" } diff --git a/package-lock.json b/package-lock.json index ee9518d..574f80b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "alvinn", - "version": "0.3.0", + "version": "0.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "alvinn", - "version": "0.3.0", + "version": "0.4.0", "hasInstallScript": true, "license": "UNLICENSED", "dependencies": { @@ -15,7 +15,6 @@ "framework7": "^8.3.0", "framework7-icons": "^5.0.5", "framework7-vue": "^8.3.0", - "material-icons": "^1.13.12", "skeleton-elements": "^4.0.1", "swiper": "^11.0.3", "vue": "^3.3.8" @@ -6644,11 +6643,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/material-icons": { - "version": "1.13.12", - "resolved": "https://registry.npmjs.org/material-icons/-/material-icons-1.13.12.tgz", - "integrity": "sha512-/2YoaB79IjUK2B2JB+vIXXYGtBfHb/XG66LvoKVM5ykHW7yfrV5SP6d7KLX6iijY6/G9GqwgtPQ/sbhFnOURVA==" - }, "node_modules/meow": { "version": "12.1.1", "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz", @@ -14206,11 +14200,6 @@ "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", "dev": true }, - "material-icons": { - "version": "1.13.12", - "resolved": "https://registry.npmjs.org/material-icons/-/material-icons-1.13.12.tgz", - "integrity": "sha512-/2YoaB79IjUK2B2JB+vIXXYGtBfHb/XG66LvoKVM5ykHW7yfrV5SP6d7KLX6iijY6/G9GqwgtPQ/sbhFnOURVA==" - }, "meow": { "version": "12.1.1", "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz", diff --git a/package.json b/package.json index c15972b..c84800e 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "cordova-ios": "cross-env TARGET=cordova cross-env NODE_ENV=production vite build && node ./build/build-cordova.js && cd cordova && cordova run ios", "build-cordova-android": "cross-env TARGET=cordova cross-env NODE_ENV=production vite build && node ./build/build-cordova.js && cd cordova && cordova build android", "cordova-android": "cross-env TARGET=cordova cross-env NODE_ENV=production vite build && node ./build/build-cordova.js && cd cordova && cordova run android", - "postinstall": "cpy --flat ./node_modules/framework7-icons/fonts/*.* ./src/fonts/ && cpy --flat ./node_modules/material-icons/iconfont/*.* ./src/fonts/" + "postinstall": "cpy --flat ./node_modules/framework7-icons/fonts/*.* ./src/fonts/" }, "browserslist": [ "IOS >= 15", @@ -28,7 +28,6 @@ "framework7": "^8.3.0", "framework7-icons": "^5.0.5", "framework7-vue": "^8.3.0", - "material-icons": "^1.13.12", "skeleton-elements": "^4.0.1", "swiper": "^11.0.3", "vue": "^3.3.8" diff --git a/src/css/icons.css b/src/css/icons.css index 95a036a..a6fa9bd 100644 --- a/src/css/icons.css +++ b/src/css/icons.css @@ -1,30 +1,3 @@ -/* Material Icons Font (for MD theme) */ -@font-face { - font-family: 'Material Icons'; - font-style: normal; - font-weight: 400; - src: local('Material Icons'), local('MaterialIcons-Regular'), - url(../fonts/material-icons.woff2) format('woff2'), - url(../fonts/material-icons.woff) format('woff'); -} -.material-icons { - font-family: 'Material Icons'; - font-weight: normal; - font-style: normal; - font-size: 24px; - display: inline-block; - line-height: 1; - text-transform: none; - letter-spacing: normal; - word-wrap: normal; - white-space: nowrap; - direction: ltr; - -webkit-font-smoothing: antialiased; - text-rendering: optimizeLegibility; - -moz-osx-font-smoothing: grayscale; - font-feature-settings: 'liga'; -} - /* Framework7 Icons Font (for iOS theme) */ @font-face { font-family: 'Framework7 Icons'; diff --git a/src/fonts/_mixins.scss b/src/fonts/_mixins.scss deleted file mode 100644 index ee33f89..0000000 --- a/src/fonts/_mixins.scss +++ /dev/null @@ -1,55 +0,0 @@ -// @see https://github.com/twbs/bootstrap/blob/main/scss/_functions.scss -@function material-icons-str-replace($string, $search, $replace: '') { - $index: str-index($string, $search); - @if $index { - @return str-slice($string, 1, $index - 1) + $replace + - material-icons-str-replace( - str-slice($string, $index + str-length($search)), - $search, - $replace - ); - } - @return $string; -} - -@mixin material-icons-font-class($font-family) { - font-family: $font-family; - font-weight: normal; - font-style: normal; - font-size: $material-icons-font-size; - line-height: 1; - letter-spacing: normal; - text-transform: none; - display: inline-block; - white-space: nowrap; - word-wrap: normal; - direction: ltr; - -webkit-font-smoothing: antialiased; // Support for all WebKit browsers - -moz-osx-font-smoothing: grayscale; // Support for Firefox - text-rendering: optimizeLegibility; // Support for Safari and Chrome - font-feature-settings: 'liga'; // Support for IE -} - -@mixin material-icons-font($font-family) { - $class-name: to-lower-case($font-family); - $class-name: material-icons-str-replace($class-name, ' ', '-'); - $font-file: $material-icons-font-path + $class-name; - - @font-face { - font-family: $font-family; - font-style: normal; - font-weight: 400; - font-display: $material-icons-font-display; - src: url('#{$font-file}.woff2') format('woff2'), - url('#{$font-file}.woff') format('woff'); - } - - .#{$class-name} { - @include material-icons-font-class($font-family); - } -} - -@mixin material-icons() { - @warn "material-icons() Sass mixin has been deprecated as of 1.0. Use '@extend .material-icons;' instead of '@include material-icons();'."; - @include material-icons-font-class('Material Icons'); -} diff --git a/src/fonts/_variables.scss b/src/fonts/_variables.scss deleted file mode 100644 index 40bc19f..0000000 --- a/src/fonts/_variables.scss +++ /dev/null @@ -1,3 +0,0 @@ -$material-icons-font-path: './' !default; -$material-icons-font-size: 24px !default; -$material-icons-font-display: block !default; diff --git a/src/fonts/filled.css b/src/fonts/filled.css deleted file mode 100644 index 75e83a8..0000000 --- a/src/fonts/filled.css +++ /dev/null @@ -1,24 +0,0 @@ -@font-face { - font-family: "Material Icons"; - font-style: normal; - font-weight: 400; - font-display: block; - src: url("./material-icons.woff2") format("woff2"), url("./material-icons.woff") format("woff"); -} -.material-icons { - font-family: "Material Icons"; - font-weight: normal; - font-style: normal; - font-size: 24px; - line-height: 1; - letter-spacing: normal; - text-transform: none; - display: inline-block; - white-space: nowrap; - word-wrap: normal; - direction: ltr; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-rendering: optimizeLegibility; - font-feature-settings: "liga"; -} diff --git a/src/fonts/filled.scss b/src/fonts/filled.scss deleted file mode 100644 index e1b258c..0000000 --- a/src/fonts/filled.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import 'variables'; -@import 'mixins'; - -@include material-icons-font('Material Icons'); diff --git a/src/fonts/material-icons-outlined.woff b/src/fonts/material-icons-outlined.woff deleted file mode 100644 index edeb9df..0000000 Binary files a/src/fonts/material-icons-outlined.woff and /dev/null differ diff --git a/src/fonts/material-icons-outlined.woff2 b/src/fonts/material-icons-outlined.woff2 deleted file mode 100644 index d44b948..0000000 Binary files a/src/fonts/material-icons-outlined.woff2 and /dev/null differ diff --git a/src/fonts/material-icons-round.woff b/src/fonts/material-icons-round.woff deleted file mode 100644 index bc0002b..0000000 Binary files a/src/fonts/material-icons-round.woff and /dev/null differ diff --git a/src/fonts/material-icons-round.woff2 b/src/fonts/material-icons-round.woff2 deleted file mode 100644 index e9e305f..0000000 Binary files a/src/fonts/material-icons-round.woff2 and /dev/null differ diff --git a/src/fonts/material-icons-sharp.woff b/src/fonts/material-icons-sharp.woff deleted file mode 100644 index 80d8c99..0000000 Binary files a/src/fonts/material-icons-sharp.woff and /dev/null differ diff --git a/src/fonts/material-icons-sharp.woff2 b/src/fonts/material-icons-sharp.woff2 deleted file mode 100644 index 4062685..0000000 Binary files a/src/fonts/material-icons-sharp.woff2 and /dev/null differ diff --git a/src/fonts/material-icons-two-tone.woff b/src/fonts/material-icons-two-tone.woff deleted file mode 100644 index ddf106c..0000000 Binary files a/src/fonts/material-icons-two-tone.woff and /dev/null differ diff --git a/src/fonts/material-icons-two-tone.woff2 b/src/fonts/material-icons-two-tone.woff2 deleted file mode 100644 index 8f79990..0000000 Binary files a/src/fonts/material-icons-two-tone.woff2 and /dev/null differ diff --git a/src/fonts/material-icons.css b/src/fonts/material-icons.css deleted file mode 100644 index 3cd7aab..0000000 --- a/src/fonts/material-icons.css +++ /dev/null @@ -1,124 +0,0 @@ -@font-face { - font-family: "Material Icons"; - font-style: normal; - font-weight: 400; - font-display: block; - src: url("./material-icons.woff2") format("woff2"), url("./material-icons.woff") format("woff"); -} -.material-icons { - font-family: "Material Icons"; - font-weight: normal; - font-style: normal; - font-size: 24px; - line-height: 1; - letter-spacing: normal; - text-transform: none; - display: inline-block; - white-space: nowrap; - word-wrap: normal; - direction: ltr; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-rendering: optimizeLegibility; - font-feature-settings: "liga"; -} - -@font-face { - font-family: "Material Icons Outlined"; - font-style: normal; - font-weight: 400; - font-display: block; - src: url("./material-icons-outlined.woff2") format("woff2"), url("./material-icons-outlined.woff") format("woff"); -} -.material-icons-outlined { - font-family: "Material Icons Outlined"; - font-weight: normal; - font-style: normal; - font-size: 24px; - line-height: 1; - letter-spacing: normal; - text-transform: none; - display: inline-block; - white-space: nowrap; - word-wrap: normal; - direction: ltr; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-rendering: optimizeLegibility; - font-feature-settings: "liga"; -} - -@font-face { - font-family: "Material Icons Round"; - font-style: normal; - font-weight: 400; - font-display: block; - src: url("./material-icons-round.woff2") format("woff2"), url("./material-icons-round.woff") format("woff"); -} -.material-icons-round { - font-family: "Material Icons Round"; - font-weight: normal; - font-style: normal; - font-size: 24px; - line-height: 1; - letter-spacing: normal; - text-transform: none; - display: inline-block; - white-space: nowrap; - word-wrap: normal; - direction: ltr; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-rendering: optimizeLegibility; - font-feature-settings: "liga"; -} - -@font-face { - font-family: "Material Icons Sharp"; - font-style: normal; - font-weight: 400; - font-display: block; - src: url("./material-icons-sharp.woff2") format("woff2"), url("./material-icons-sharp.woff") format("woff"); -} -.material-icons-sharp { - font-family: "Material Icons Sharp"; - font-weight: normal; - font-style: normal; - font-size: 24px; - line-height: 1; - letter-spacing: normal; - text-transform: none; - display: inline-block; - white-space: nowrap; - word-wrap: normal; - direction: ltr; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-rendering: optimizeLegibility; - font-feature-settings: "liga"; -} - -@font-face { - font-family: "Material Icons Two Tone"; - font-style: normal; - font-weight: 400; - font-display: block; - src: url("./material-icons-two-tone.woff2") format("woff2"), url("./material-icons-two-tone.woff") format("woff"); -} -.material-icons-two-tone { - font-family: "Material Icons Two Tone"; - font-weight: normal; - font-style: normal; - font-size: 24px; - line-height: 1; - letter-spacing: normal; - text-transform: none; - display: inline-block; - white-space: nowrap; - word-wrap: normal; - direction: ltr; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-rendering: optimizeLegibility; - font-feature-settings: "liga"; -} diff --git a/src/fonts/material-icons.scss b/src/fonts/material-icons.scss deleted file mode 100644 index 3a09427..0000000 --- a/src/fonts/material-icons.scss +++ /dev/null @@ -1,5 +0,0 @@ -@import 'filled'; -@import 'outlined'; -@import 'round'; -@import 'sharp'; -@import 'two-tone'; diff --git a/src/fonts/material-icons.woff b/src/fonts/material-icons.woff deleted file mode 100644 index 88fdf4d..0000000 Binary files a/src/fonts/material-icons.woff and /dev/null differ diff --git a/src/fonts/material-icons.woff2 b/src/fonts/material-icons.woff2 deleted file mode 100644 index 5492a6e..0000000 Binary files a/src/fonts/material-icons.woff2 and /dev/null differ diff --git a/src/fonts/outlined.css b/src/fonts/outlined.css deleted file mode 100644 index f359e2a..0000000 --- a/src/fonts/outlined.css +++ /dev/null @@ -1,24 +0,0 @@ -@font-face { - font-family: "Material Icons Outlined"; - font-style: normal; - font-weight: 400; - font-display: block; - src: url("./material-icons-outlined.woff2") format("woff2"), url("./material-icons-outlined.woff") format("woff"); -} -.material-icons-outlined { - font-family: "Material Icons Outlined"; - font-weight: normal; - font-style: normal; - font-size: 24px; - line-height: 1; - letter-spacing: normal; - text-transform: none; - display: inline-block; - white-space: nowrap; - word-wrap: normal; - direction: ltr; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-rendering: optimizeLegibility; - font-feature-settings: "liga"; -} diff --git a/src/fonts/outlined.scss b/src/fonts/outlined.scss deleted file mode 100644 index cabbac0..0000000 --- a/src/fonts/outlined.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import 'variables'; -@import 'mixins'; - -@include material-icons-font('Material Icons Outlined'); diff --git a/src/fonts/round.css b/src/fonts/round.css deleted file mode 100644 index c0b13ba..0000000 --- a/src/fonts/round.css +++ /dev/null @@ -1,24 +0,0 @@ -@font-face { - font-family: "Material Icons Round"; - font-style: normal; - font-weight: 400; - font-display: block; - src: url("./material-icons-round.woff2") format("woff2"), url("./material-icons-round.woff") format("woff"); -} -.material-icons-round { - font-family: "Material Icons Round"; - font-weight: normal; - font-style: normal; - font-size: 24px; - line-height: 1; - letter-spacing: normal; - text-transform: none; - display: inline-block; - white-space: nowrap; - word-wrap: normal; - direction: ltr; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-rendering: optimizeLegibility; - font-feature-settings: "liga"; -} diff --git a/src/fonts/round.scss b/src/fonts/round.scss deleted file mode 100644 index ba3260c..0000000 --- a/src/fonts/round.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import 'variables'; -@import 'mixins'; - -@include material-icons-font('Material Icons Round'); diff --git a/src/fonts/sharp.css b/src/fonts/sharp.css deleted file mode 100644 index 18e9149..0000000 --- a/src/fonts/sharp.css +++ /dev/null @@ -1,24 +0,0 @@ -@font-face { - font-family: "Material Icons Sharp"; - font-style: normal; - font-weight: 400; - font-display: block; - src: url("./material-icons-sharp.woff2") format("woff2"), url("./material-icons-sharp.woff") format("woff"); -} -.material-icons-sharp { - font-family: "Material Icons Sharp"; - font-weight: normal; - font-style: normal; - font-size: 24px; - line-height: 1; - letter-spacing: normal; - text-transform: none; - display: inline-block; - white-space: nowrap; - word-wrap: normal; - direction: ltr; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-rendering: optimizeLegibility; - font-feature-settings: "liga"; -} diff --git a/src/fonts/sharp.scss b/src/fonts/sharp.scss deleted file mode 100644 index cb60161..0000000 --- a/src/fonts/sharp.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import 'variables'; -@import 'mixins'; - -@include material-icons-font('Material Icons Sharp'); diff --git a/src/fonts/two-tone.css b/src/fonts/two-tone.css deleted file mode 100644 index fb9b4c9..0000000 --- a/src/fonts/two-tone.css +++ /dev/null @@ -1,24 +0,0 @@ -@font-face { - font-family: "Material Icons Two Tone"; - font-style: normal; - font-weight: 400; - font-display: block; - src: url("./material-icons-two-tone.woff2") format("woff2"), url("./material-icons-two-tone.woff") format("woff"); -} -.material-icons-two-tone { - font-family: "Material Icons Two Tone"; - font-weight: normal; - font-style: normal; - font-size: 24px; - line-height: 1; - letter-spacing: normal; - text-transform: none; - display: inline-block; - white-space: nowrap; - word-wrap: normal; - direction: ltr; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-rendering: optimizeLegibility; - font-feature-settings: "liga"; -} diff --git a/src/fonts/two-tone.scss b/src/fonts/two-tone.scss deleted file mode 100644 index 110f7b6..0000000 --- a/src/fonts/two-tone.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import 'variables'; -@import 'mixins'; - -@include material-icons-font('Material Icons Two Tone'); diff --git a/src/pages/home.vue b/src/pages/home.vue index a78dd09..e8b7c1d 100644 --- a/src/pages/home.vue +++ b/src/pages/home.vue @@ -3,7 +3,7 @@ - + A.L.V.I.N.N.