Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
14dfdf0
copy files from v1 to v2
izzabizz5 Jan 30, 2025
96fd472
initial commit
Feb 10, 2025
57e9ea9
initial commit
izzabizz5 Feb 10, 2025
47dd16f
implementing json for templates and loading with some data
izzabizz5 Feb 11, 2025
ed89334
Merge pull request #1 from haxtheweb/master
SkylerKoba88 Feb 13, 2025
3e4666b
fix your shit
Feb 18, 2025
4d692af
Merge branch 'master' of github.com:SkylerKoba88/webcomponents
Feb 18, 2025
a79115b
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Feb 18, 2025
64d03bb
Merge branch 'master' of https://github.com/izzabizz5/webcomponents
Feb 18, 2025
c44c2c6
Update app-hax-receipes.json
btopro Feb 18, 2025
98d718a
Merge pull request #1 from btopro/patch-2
izzabizz5 Feb 18, 2025
7844a88
Merge branch 'master' of https://github.com/izzabizz5/webcomponents
izzabizz5 Feb 18, 2025
464ee90
adding icons and reducing cluttered stuff
izzabizz5 Feb 18, 2025
1d7d26a
reducing fluff
izzabizz5 Feb 18, 2025
fc70565
messy filtering added
Feb 18, 2025
e6c9235
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Feb 20, 2025
e30831b
combined filter components
Feb 20, 2025
d3bb88a
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Feb 20, 2025
f171673
fixed filter to show up
Feb 20, 2025
bc83172
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Feb 20, 2025
1a08d1a
add json data
izzabizz5 Feb 20, 2025
fcf8366
changes
Feb 20, 2025
6d7ed79
Merge branch 'master' of https://github.com/izzabizz5/webcomponents
Feb 20, 2025
b814a40
update json category names
izzabizz5 Feb 20, 2025
e3d2b8a
updated filter section
Feb 20, 2025
70a697a
fetching works
izzabizz5 Feb 25, 2025
2637cfd
tues
Feb 25, 2025
24696e3
please work
Feb 25, 2025
06bd644
please just work
Feb 25, 2025
6e2c10a
reset and filter functionality
izzabizz5 Feb 25, 2025
9cf1438
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Feb 25, 2025
34cf7de
updated style
Feb 25, 2025
f391e90
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Feb 25, 2025
e4a8d47
new style
Feb 25, 2025
69fb7fd
background removed
izzabizz5 Feb 25, 2025
bec1fe2
design stuff
Feb 27, 2025
35b5753
fixed alignment
Feb 27, 2025
daccadf
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Feb 27, 2025
4627f0b
bleh
Feb 27, 2025
7fbd20d
Add files via upload
SkylerKoba88 Feb 27, 2025
4ce67d9
blehhhh
Feb 27, 2025
7b8a30b
Add files via upload
SkylerKoba88 Feb 27, 2025
3331dae
mmmemememe
Feb 27, 2025
f0a512b
Merge branch 'master' of github.com:SkylerKoba88/webcomponents
Feb 27, 2025
505d308
changed LM background
Feb 27, 2025
5d4fbf7
Add files via upload
SkylerKoba88 Feb 27, 2025
3a95e52
major styling changes
Feb 27, 2025
3367acf
bckgrnd stuff
Mar 4, 2025
8f2b3a3
Add files via upload
SkylerKoba88 Mar 4, 2025
f0552e3
Add files via upload
SkylerKoba88 Mar 4, 2025
65a86d5
some design changes
Mar 4, 2025
131d346
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Mar 4, 2025
c15c2d5
messing w/ colors
Mar 4, 2025
889a6d1
background
Mar 6, 2025
0aa3bcb
Add files via upload
SkylerKoba88 Mar 6, 2025
3b27992
Add files via upload
SkylerKoba88 Mar 6, 2025
03999bb
button functionality (select -> selected & continue)
izzabizz5 Mar 6, 2025
1fef112
chnaging darkmode
Mar 6, 2025
b7f08d2
Add files via upload
SkylerKoba88 Mar 6, 2025
f90af69
bbbb
Mar 6, 2025
0d71e90
Add files via upload
SkylerKoba88 Mar 6, 2025
535ceeb
yay!
izzabizz5 Mar 6, 2025
30c261f
only one card can be selected at a time.
izzabizz5 Mar 6, 2025
c58a165
sun icon
Mar 6, 2025
9df6aed
Add files via upload
SkylerKoba88 Mar 6, 2025
0e3656d
moon
Mar 6, 2025
b872911
Add files via upload
SkylerKoba88 Mar 6, 2025
6667179
changed toggle
Mar 6, 2025
9ffccca
changed site image
Mar 18, 2025
9130990
Add files via upload
SkylerKoba88 Mar 18, 2025
9e1b1da
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Mar 18, 2025
3837b9f
Add files via upload
SkylerKoba88 Mar 18, 2025
afbc603
background image
Mar 18, 2025
13705bc
Merge branch 'master' of github.com:SkylerKoba88/webcomponents
Mar 18, 2025
79189fe
added bg images
Mar 18, 2025
a117c95
renamed file
Mar 18, 2025
cb45f76
fixed merge issues
Mar 18, 2025
8359931
reset button on bottom
izzabizz5 Mar 18, 2025
4d458da
bleh
Mar 18, 2025
607ca19
fix
Mar 18, 2025
a06fb91
styling filter section a tad
izzabizz5 Mar 18, 2025
399c0d0
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Mar 18, 2025
1de790e
tags and use case stuff
Mar 18, 2025
c366cd5
fix background repeat
Mar 18, 2025
589ba3f
styling
izzabizz5 Mar 18, 2025
73a7ffe
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Mar 18, 2025
51d03a3
added 'brochure' to receipes
izzabizz5 Mar 25, 2025
9e2f064
messing around
Mar 25, 2025
130ff47
Add files via upload
SkylerKoba88 Mar 25, 2025
89f54b5
stuff
Mar 25, 2025
28764dc
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Mar 25, 2025
cfaf869
icons on image and tooltips of icons appearing below in a list format
izzabizz5 Mar 27, 2025
d00c418
fixed scroll buttons
Mar 27, 2025
2dec118
fix
Mar 27, 2025
a78a26c
bcgrnd stuff
Mar 27, 2025
5aa8c31
Add files via upload
SkylerKoba88 Mar 27, 2025
2c030a1
carousel
Mar 27, 2025
495bbdc
fixed site details overlay
Apr 1, 2025
237d16e
fixed search bar for existing sites
Apr 1, 2025
155de30
search bar
izzabizz5 Apr 1, 2025
b9bb85d
fixed colors and spacing
Apr 1, 2025
34c23ea
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Apr 3, 2025
826f9d2
icons and tooltip looking prrreeeetty good now
izzabizz5 Apr 8, 2025
880d115
combine search bars into the filter search bar.
izzabizz5 Apr 8, 2025
c346c4f
fixed sizing issues
izzabizz5 Apr 8, 2025
6f0df47
professional return cards
Apr 10, 2025
d61d882
more background stuff
Apr 10, 2025
f0ec58a
Add files via upload
SkylerKoba88 Apr 10, 2025
1db1bcc
muy professional
Apr 10, 2025
5c5e158
some design stuff
Apr 15, 2025
841408d
trying to get return cards to filter with tag buttons
izzabizz5 Apr 15, 2025
0983629
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 Apr 15, 2025
8733812
fixed merge issues
Apr 15, 2025
717bf43
heeeelllp
Apr 15, 2025
522da8b
fixed spacing
Apr 15, 2025
1556d2c
trying to fix filtering returning
izzabizz5 Apr 22, 2025
7c31cb4
revert lol !!!!!!!!!! XDD
izzabizz5 Apr 22, 2025
db31d82
help
Apr 22, 2025
f7e4ebf
help
Apr 22, 2025
16f7fd4
commit
izzabizz5 Apr 24, 2025
a87c507
hsfdlxvm
Apr 24, 2025
d3a5806
stuff
Apr 24, 2025
4c5e2ea
fixed filtering and labeling
izzabizz5 Apr 25, 2025
707a440
styling fixes
izzabizz5 Apr 29, 2025
b9dd2b4
fixed conflict
Apr 30, 2025
7b2763d
fixed
Apr 30, 2025
d898321
a beautiful ending
Apr 30, 2025
2186cc8
colors
May 1, 2025
1f413f4
commit
izzabizz5 May 2, 2025
221ef72
Merge branch 'master' of https://github.com/SkylerKoba88/webcomponents
izzabizz5 May 2, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 38 additions & 71 deletions elements/app-hax/app-hax.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,21 @@ import { toJS, autorun } from "mobx";
import { localStorageSet, localStorageGet } from "@haxtheweb/utils/utils.js";
import "@haxtheweb/simple-tooltip/simple-tooltip.js";
import { SimpleColors } from "@haxtheweb/simple-colors/simple-colors.js";
import { store } from "./lib/v1/AppHaxStore.js";
import { store } from "./lib/v2/AppHaxStore.js";
import { I18NMixin } from "@haxtheweb/i18n-manager/lib/I18NMixin.js";
import { AppHaxAPI } from "./lib/v1/AppHaxBackendAPI.js";
import { AppHaxAPI } from "./lib/v2/AppHaxBackendAPI.js";
import { SimpleTourManager } from "@haxtheweb/simple-popover/lib/simple-tour.js";
import { SuperDaemonInstance } from "@haxtheweb/super-daemon/super-daemon.js";
import "@haxtheweb/simple-toolbar/lib/simple-toolbar-button.js";
import "@haxtheweb/simple-colors-shared-styles/simple-colors-shared-styles.js";
import "./lib/v1/AppHaxRouter.js";
import "./lib/v1/app-hax-label.js";
import "./lib/v1/app-hax-top-bar.js";
import "./lib/v2/AppHaxRouter.js";
import "./lib/v2/app-hax-label.js";
import "./lib/v2/app-hax-top-bar.js";
import { SimpleTourFinder } from "@haxtheweb/simple-popover/lib/SimpleTourFinder.js";
import "./lib/v2/app-hax-use-case.js";
import "./lib/v2/app-hax-use-case-filter.js";
import "./lib/v2/app-hax-search-results.js";
import "./lib/v2/app-hax-scroll-button.js";

const logoutBtn = new URL("./lib/assets/images/Logout.svg", import.meta.url)
.href;
Expand Down Expand Up @@ -472,7 +476,6 @@ Window size: ${globalThis.innerWidth}x${globalThis.innerHeight}
const badDevice = toJS(store.badDevice);
if (badDevice === false) {
import("@haxtheweb/rpg-character/rpg-character.js");
import("./lib/random-word/random-word.js");
} else if (badDevice === true) {
globalThis.document.body.classList.add("bad-device");
}
Expand Down Expand Up @@ -716,7 +719,7 @@ Window size: ${globalThis.innerWidth}x${globalThis.innerHeight}

// eslint-disable-next-line class-methods-use-this
login() {
import("./lib/v1/app-hax-site-login.js").then(() => {
import("./lib/v2/app-hax-site-login.js").then(() => {
const p = globalThis.document.createElement("app-hax-site-login");
if (this.querySelector('[slot="externalproviders"]')) {
const cloneSlot = this.querySelector(
Expand Down Expand Up @@ -764,6 +767,9 @@ Window size: ${globalThis.innerWidth}x${globalThis.innerHeight}
#home {
display: inline-flex;
}
#wt {
border: solid 1px var(--simple-colors-default-theme-accent-12, var(--accent-color));
}
simple-toolbar-button {
min-width: 48px;
margin: 0;
Expand Down Expand Up @@ -859,13 +865,18 @@ Window size: ${globalThis.innerWidth}x${globalThis.innerHeight}
}
}
.label {
text-align: center;
display: inline-flex;
text-align: flex-start;
align-items: center;
}
app-hax-label {
animation: 0.8s ease-in-out 0s scrollin;
-webkit-animation: 0.8s ease-in-out 0s scrollin;
display: block;
display: flex;
align-self: flex-start;
overflow: hidden;
margin-left: 24px;
margin-right: 24px;
}
app-hax-label h1 {
font-weight: normal;
Expand Down Expand Up @@ -933,29 +944,6 @@ Window size: ${globalThis.innerWidth}x${globalThis.innerHeight}
font-family: "Press Start 2P", sans-serif;
font-size: 12px;
}

random-word:not(:defined) {
display: none;
}
random-word {
transform: rotate(25deg);
position: absolute;
right: 10px;
top: 120px;
padding: 12px;
font-size: 12px;
border: 4px solid var(--simple-colors-default-theme-grey-12);
background-color: var(--simple-colors-default-theme-yellow-5);
color: var(--simple-colors-default-theme-grey-12);
width: 100px;
word-wrap: break-word;
text-align: center;
cursor: pointer;
user-select: none;
opacity: 1;
visibility: visible;
transition: all 0.3s ease-in-out;
}
#helpbtn {
--simple-icon-height: 50px;
--simple-icon-width: 50px;
Expand Down Expand Up @@ -991,15 +979,13 @@ Window size: ${globalThis.innerWidth}x${globalThis.innerHeight}
}
}
@media (max-width: 640px) {
random-word {
display: none;
}
.content {
margin-top: 4px;
}
.start-journey {
padding-top: 0;
}

app-hax-site-button {
--app-hax-site-button-font-size: 12px;
}
Expand Down Expand Up @@ -1048,15 +1034,15 @@ Window size: ${globalThis.innerWidth}x${globalThis.innerHeight}
if (store.AppHaxAPI && this.basePath) {
store.AppHaxAPI.basePath = this.basePath;
}
import("./lib/v1/app-hax-steps.js");
import("./lib/v1/app-hax-site-button.js");
import("./lib/v2/app-hax-steps.js");
import("./lib/v2/app-hax-site-button.js");
import("wired-elements/lib/wired-button.js");
import("./lib/v1/app-hax-toast.js");
import("./lib/v1/app-hax-wired-toggle.js");
import("./lib/v1/app-hax-search-bar.js");
import("./lib/v1/app-hax-search-results.js");
import("./lib/v1/app-hax-user-menu.js");
import("./lib/v1/app-hax-user-menu-button.js");
import("./lib/v2/app-hax-toast.js");
import("./lib/v2/app-hax-wired-toggle.js");
import("./lib/v2/app-hax-search-bar.js");
import("./lib/v2/app-hax-search-results.js");
import("./lib/v2/app-hax-user-menu.js");
import("./lib/v2/app-hax-user-menu-button.js");
this.dispatchEvent(
new CustomEvent("app-hax-loaded", {
composed: true,
Expand Down Expand Up @@ -1163,10 +1149,6 @@ Window size: ${globalThis.innerWidth}x${globalThis.innerHeight}
data-event="super-daemon"
show-text-label
></simple-toolbar-button>
<app-hax-search-bar
slot="center"
?disabled="${this.isNewUser}"
></app-hax-search-bar>
<wired-button
elevation="1"
slot="right"
Expand Down Expand Up @@ -1288,21 +1270,12 @@ Window size: ${globalThis.innerWidth}x${globalThis.innerHeight}
: ``}
</app-hax-label>
</div>
<random-word
key="${this.isNewUser ? `new` : `return`}"
.phrases="${this.phrases}"
@click="${this.getNewWord}"
></random-word>

<section class="content">${this.appBody(this.appMode)}</section>
</confetti-container>
</main>`;
}

getNewWord() {
this.shadowRoot.querySelector("random-word").getNewWord();
store.appEl.playSound("click");
}

appBody(routine) {
let template = html``;
switch (routine) {
Expand All @@ -1320,21 +1293,15 @@ Window size: ${globalThis.innerWidth}x${globalThis.innerHeight}
}
return template;
}


//EDIT HERE
templateHome() {
return html`<div class="start-journey">
<a
href="createSite-step-1"
@click="${this.startJourney}"
tabindex="-1"
title="${this.t.startNewJourney}"
>
<app-hax-site-button
label="&gt; ${this.t.startNewJourney}"
></app-hax-site-button>
</a>
return html`
<div class="start-journey">
<app-hax-use-case-filter></app-hax-use-case-filter>
</div>
<app-hax-search-results></app-hax-search-results>`;

`;
}

// eslint-disable-next-line class-methods-use-this
Expand Down Expand Up @@ -1408,4 +1375,4 @@ globalThis.AppHax.requestAvailability = () => {
globalThis.AppHax.instance = globalThis.document.querySelector(AppHax.tag);
}
return globalThis.AppHax.instance;
};
};
2 changes: 1 addition & 1 deletion elements/app-hax/demo/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -242,4 +242,4 @@ <h2>Get involved!</h2>
<p>HAX is supported by a collaboration of multiple Penn State colleges and departmens.</p>
</footer>
</body>
</html>
</html>
18 changes: 8 additions & 10 deletions elements/app-hax/demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
padding: 0;
font-family: 'Press Start 2P', sans-serif;
overflow-x: hidden;
background-image: url('../lib/assets/images/LMGridBox.svg');
background-image: url('../lib/assets/images/LMBackgroundImage.svg');
background-repeat: repeat;
background-position: center center;
background-size: auto, 20% auto, 20% auto;
Expand All @@ -51,16 +51,15 @@
}
body.dark-mode {
background-color: black;
background-image: url('../lib/assets/images/DMGridBox.svg');
background-image: url('../lib/assets/images/DMBackgroundImage.svg');
--app-hax-accent-color: white;
--app-hax-background-color: black;
}
body.app-loaded:not(.bad-device) {
background-image: url('../lib/assets/images/LMGridBox.svg'), url('../lib/assets/images/DesignLightModeLeft.svg'), url('../lib/assets/images/DesignLightModeRight.svg');
background-repeat: repeat, repeat-y, repeat-y;
background-position: center center, top left, top right;
background-size: auto, 20% auto, 20% auto;
background-attachment: fixed, fixed, fixed;
background-image: url('../lib/assets/images/LMBackgroundImage.svg'), url('../lib/assets/images/DesignLightModeLeft.svg'), url('../lib/assets/images/DesignLightModeRight.svg');
background-position: top;
background-size: auto;

}
div[slot="externalproviders"] {
display: none;
Expand All @@ -69,9 +68,8 @@
display: unset;
}
body.app-loaded.dark-mode {
background-image: url('../lib/assets/images/DMGridBox.svg'), url('../lib/assets/images/DesignDarkModeLeft.svg'), url('../lib/assets/images/DesignDarkModeRight.svg');
background-image: url('../lib/assets/images/DMBackgroundImage.svg'), url('../lib/assets/images/DesignDarkModeLeft.svg'), url('../lib/assets/images/DesignDarkModeRight.svg');
}

#loading {
font-family: 'Press Start 2P', sans-serif;
text-align: center;
Expand Down Expand Up @@ -382,4 +380,4 @@
};
</script>
</body>
</html>
</html>
12 changes: 11 additions & 1 deletion elements/app-hax/demo/sites.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"name": "ist402",
"created": 1565898366,
"updated": 1615262120,
"category": ["Course"],
"git": {
"autoPush": false,
"branch": "master",
Expand Down Expand Up @@ -81,6 +82,7 @@
"name": "acctg211",
"created": 1610048864,
"updated": 1612555993,
"category": ["Blog"],
"version": "2.0.9",
"domain": "",
"logo": "",
Expand Down Expand Up @@ -149,6 +151,7 @@
"name": "geodz511",
"created": 1569349769,
"updated": 1640014827,
"category": ["Course"],
"git": {
"vendor": "github",
"branch": "master",
Expand Down Expand Up @@ -206,6 +209,7 @@
"logo": "assets/banner.jpg",
"created": 1635276018,
"updated": 1635276048,
"category": ["Brochure"],
"git": {}
},
"theme": {
Expand Down Expand Up @@ -246,6 +250,7 @@
"name": "ist210",
"created": 1592403069,
"updated": 1598281185,
"category": ["Course"],
"git": {
"autoPush": false,
"branch": "",
Expand Down Expand Up @@ -296,6 +301,7 @@
"author": "",
"description": "",
"license": "by-sa",
"category": ["Blog"],
"metadata": {
"author": {
"image": "",
Expand All @@ -308,6 +314,7 @@
"logo": "assets/banner.jpg",
"created": 1594994550,
"updated": 1595266163,
"category": ["Course"],
"git": {
"autoPush": false,
"branch": "",
Expand Down Expand Up @@ -369,6 +376,7 @@
"logo": "assets/banner.jpg",
"created": 1629208877,
"updated": 1642013655,
"category": ["Course"],
"git": {
"autoPush": false,
"branch": "",
Expand Down Expand Up @@ -425,6 +433,7 @@
"logo": "assets/banner.jpg",
"created": 1644856484,
"updated": 1644856484,
"category": ["Course"],
"git": {}
},
"theme": {
Expand Down Expand Up @@ -459,7 +468,8 @@
"domain": null,
"site": {
"created": 1558624482,
"updated": 1558624504
"updated": 1558624504,
"category": ["Course"]
},
"theme": {
"element": "learn-two-theme",
Expand Down
Loading