diff --git a/.gitignore b/.gitignore
index f8034d458..b46a1e36e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,11 +6,11 @@ node_modules
/gif
certs/*
-# [CRITICAL TO BE UN-TRACKED]
+# CRITICAL - do not uncomment
.env
WEBSITE-DEV-README.md
datalog/
# [PERSONAL]
-.vscode/
\ No newline at end of file
+# .vscode/
\ No newline at end of file
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 000000000..881fb063c
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,22 @@
+{
+ // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+ // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+
+ // List of extensions which should be recommended for users of this workspace.
+ "recommendations": [
+ "fivethree.vscode-svelte-snippets",
+ "ardenivanov.svelte-intellisense",
+ "wayou.vscode-todo-highlight",
+ "ecmel.vscode-html-css",
+ "vunguyentuan.vscode-css-variables",
+ "svelte.svelte-vscode",
+ "pkief.material-icon-theme",
+ "akamud.vscode-theme-onedark",
+ "mikestead.dotenv",
+ "pranaygp.vscode-css-peek"
+ ],
+ // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+ "unwantedRecommendations": [
+
+ ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ed52430d8..110b6431f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,43 +2,79 @@
// DOC: https://stackoverflow.com/questions/64365300/how-can-i-remove-unused-imports-declarations-from-the-entire-project-of-react-ty
// DOC: https://stackoverflow.com/questions/46722701/is-there-a-way-to-remove-unused-imports-and-declarations-from-angular-2
"editor.codeActionsOnSave": {
- // "source.fixAll": true,
- // "source.organizeImports": true,
- // "source.sortMembers": true
+ "source.fixAll": true,
+ "source.organizeImports": true,
+ // "source.sortImports": true,
+ "source.sortMembers": true
},
- // NOTE: custom highlighter for data
+ // NOTE: custom highlighter
"todohighlight.keywords": [
+ // NOTE: for information, that is rather important,
+ // NOTE: as is necessary some attention, but just informative
{
"text": "NOTE:",
"color": "#ffffff",
- "backgroundColor": "black",
- "overviewRulerColor": "grey"
+ "backgroundColor": "#131313",
+ "overviewRulerColor": "grey",
+ "borderRadius": "2px"
},
+ // [🐞] for signalling as a DEBUG step/process
{
"text": "[🐞]",
"color": "#ffffff",
- "backgroundColor": "black",
- "overviewRulerColor": "grey"
+ "backgroundColor": "#131313",
+ "overviewRulerColor": "grey",
+ "borderRadius": "2px"
},
{
- "text": "DOC:",
+ "text": "//#region",
"color": "#ffffff",
- "backgroundColor": "blue",
+ "backgroundColor": "#131313",
+ "overviewRulerColor": "grey",
+ "borderRadius": "2px"
+ },
+ {
+ "text": "//#endregion",
+ "color": "#000000",
+ "backgroundColor": "orange",
+ "overviewRulerColor": "grey",
+ "borderRadius": "2px"
+ },
+ {
+ "text": "WARNING",
+ "color": "#000000",
+ "backgroundColor": "#FFFF00",
"overviewRulerColor": "grey"
},
+ // DOC: for indicating a source/link for a target
+ // DOC: process and how-to
+ {
+ "text": "DOC:",
+ "color": "#000000",
+ "backgroundColor": "#0092FF",
+ "overviewRulerColor": "grey",
+ "borderRadius": "2px"
+ },
+ // IMPORTANT for indicating something VERY important,
+ // IMPORTANT such as: careful not to remove/alter target code
{
"text": "IMPORTANT",
- "color": "#ffffff",
- "backgroundColor": "red",
- "overviewRulerColor": "grey"
+ "color": "#000000",
+ "backgroundColor": "#F35246",
+ "overviewRulerColor": "red",
+ "isWholeLine": false,
+ "borderRadius": "2px"
},
{
- "text": "[! CRITICAL !]",
- "color": "#ffffff",
- "backgroundColor": "red",
- "overviewRulerColor": "grey"
+ "text": "CRITICAL",
+ "color": "#000000",
+ "backgroundColor": "#F35246",
+ "overviewRulerColor": "grey",
+ "isWholeLine": false,
+ "borderRadius": "2px"
}
],
+ // NOTE: SVELTE Specific Extensions (Config)
// DOC: https://discord.com/channels/457912077277855764/1036919129782878218
// DOC: https://discord.com/channels/457912077277855764/1036369208721813554
"svelte.plugin.svelte.compilerWarnings": {
@@ -75,5 +111,23 @@
"maptz.regionfolder": {
"collapseAllRegions": true,
"collapseDefaultRegionsOnOpen": true
- }
+ },
+ // NOTE: speeding up CSS STYLE location and importing
+ "css.styleSheets": [
+ // "https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css", // example
+ "/src/app.css"
+ ],
+ // IMPORTANTNOTE: configured in user/settings.json
+ "css.enabledLanguages": [
+ "html",
+ "svelte"
+ ],
+ // NOTE: does not work for SVELTE
+ "cssPeek.peekFromLanguages": [
+ "html",
+ "svelte"
+ ],
+ // "[css]": {
+ // "editor.foldingStrategy": "indentation",
+ // },
}
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8f369992a..091278cb9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -39,3 +39,16 @@ Work in Progress pull requests are also welcome to get feedback early on, or if
- [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)
- [Using Pull Requests](https://help.github.com/articles/about-pull-requests/)
- [GitHub Help](https://help.github.com)
+
+### GitHub Flow:
+
+```
+//the branch you want to overwrite
+git checkout email
+
+//reset to the new branch
+git reset --hard origin/staging
+
+// push to remote
+git push -f
+```
diff --git a/CONTRIBUTING/TEMPLATE-WIDGET.svelte b/CONTRIBUTING/TEMPLATE-WIDGET.svelte
deleted file mode 100644
index accbe0e90..000000000
--- a/CONTRIBUTING/TEMPLATE-WIDGET.svelte
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CONTRIBUTING/TEMPLATE.svelte b/CONTRIBUTING/TEMPLATE.svelte
new file mode 100644
index 000000000..79430ba3c
--- /dev/null
+++ b/CONTRIBUTING/TEMPLATE.svelte
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+
+
+ {WIDGET_T_DATA?.months?.months[monthNames[tempDate.getMonth()]]} + {tempDate.getFullYear()} +
+ monthChange(1)} + class="cursor-pointer" + /> +
+ + {WIDGET_T_DATA?.days[day] || ""} + + |
+ {/each}
+
---|
dateChange(item)}> + {item.getDate()} + | + {/each} +
+ {new Date(FIXTURE_D?.fixture_day).getDate()/new Date(FIXTURE_D?.fixture_day).getMonth()} +
+ {/if} ++ {FIXTURE_D?.minute || '0'} + ' + +
+ + {:else if FIXTURE_D?.status === 'HT'} ++ {WIDGET_T_DATA?.status_abbrev?.HT} +
+ + {:else} ++ {(`0${new Date(FIXTURE_D?.time + 'Z').getHours()}`.slice(-2) + + ':' + + `0${new Date(FIXTURE_D?.time + 'Z').getMinutes()}`.slice(-2)) + .split(' ').join('')} +
+ + {#if ['FT','FT_PEN','AET'].includes(FIXTURE_D?.status)} ++ {WIDGET_T_DATA?.status_abbrev[FIXTURE_D?.status] || FIXTURE_D?.status} +
+ {/if} + {/if} ++ {FIXTURE_D?.teams?.home?.name} +
+ + {#if FIXTURE_D.teams?.home?.red_cards} + {#if FIXTURE_D.teams?.home?.red_cards == 1} + + {:else if FIXTURE_D?.teams?.home?.red_cards == 2} + + {:else} + + {/if} + {/if} ++ {FIXTURE_D?.teams?.away?.name} +
+ + {#if FIXTURE_D.teams?.away?.red_cards} + {#if FIXTURE_D.teams?.away?.red_cards == 1} + + {:else if FIXTURE_D?.teams?.away?.red_cards == 2} + + {:else} + + {/if} + {/if} ++ {WIDGET_T_DATA?.tip || 'TIP'} +
++ {FIXTURE_D?.teams?.home?.score} +
+ ++ {FIXTURE_D?.teams?.away?.score} +
+
+ {WIDGET_T_DATA?.days[WEEK_DAYS_ABBRV_1[new Date(item).getDay()]] || ""}
+
+
+ {new Date(item).getDate()}
+
+
+ {WIDGET_T_DATA?.all || 'All'} ({numOfFixtures || 0}) +
++ {WIDGET_T_DATA?.live || 'Live'} ({numOfFixturesLive || 0}) +
+ {#if numOfFixturesLive != 0} + + {/if} +